From: Adam Dybkowski <adamx.dybkowski@intel.com>
To: dev@dpdk.org, fiona.trahe@intel.com,
pablo.de.lara.guarch@intel.com, arturx.trybula@intel.com
Cc: Adam Dybkowski <adamx.dybkowski@intel.com>
Subject: [dpdk-dev] [PATCH 1/2] test/compress: add external buffer in mbuf API test
Date: Tue, 3 Sep 2019 11:43:11 +0200 [thread overview]
Message-ID: <20190903094312.8780-2-adamx.dybkowski@intel.com> (raw)
In-Reply-To: <20190903094312.8780-1-adamx.dybkowski@intel.com>
Adds a new test to verify external buffer in mbuf APIs.
Initialize fields in test_data_params structures by name
for better readability.
Signed-off-by: Adam Dybkowski <adamx.dybkowski@intel.com>
---
app/test/test_compressdev.c | 245 ++++++++++++++++++++++++++++--------
1 file changed, 194 insertions(+), 51 deletions(-)
diff --git a/app/test/test_compressdev.c b/app/test/test_compressdev.c
index 992eac8e0..31aafc427 100644
--- a/app/test/test_compressdev.c
+++ b/app/test/test_compressdev.c
@@ -100,6 +100,11 @@ struct test_data_params {
enum zlib_direction zlib_dir;
unsigned int out_of_space;
unsigned int big_data;
+ unsigned int use_external_mbufs;
+ unsigned int inbuf_data_size;
+ const struct rte_memzone *inbuf_memzone;
+ const struct rte_memzone *compbuf_memzone;
+ const struct rte_memzone *uncompbuf_memzone;
};
static struct comp_testsuite_params testsuite_params = { 0 };
@@ -710,6 +715,11 @@ prepare_sgl_bufs(const char *test_buf, struct rte_mbuf *head_buf,
return 0;
}
+static void
+extbuf_free_callback(void *addr __rte_unused, void *opaque __rte_unused)
+{
+}
+
/*
* Compresses and decompresses buffer with compressdev API and Zlib API
*/
@@ -729,6 +739,9 @@ test_deflate_comp_decomp(const struct interim_data_params *int_data,
unsigned int out_of_space = test_data->out_of_space;
unsigned int big_data = test_data->big_data;
enum zlib_direction zlib_dir = test_data->zlib_dir;
+ struct rte_mbuf_ext_shared_info inbuf_info;
+ struct rte_mbuf_ext_shared_info compbuf_info;
+ struct rte_mbuf_ext_shared_info decompbuf_info;
int ret_status = -1;
int ret;
struct rte_mbuf *uncomp_bufs[num_bufs];
@@ -785,7 +798,20 @@ test_deflate_comp_decomp(const struct interim_data_params *int_data,
goto exit;
}
- if (buff_type == SGL_BOTH || buff_type == SGL_TO_LB) {
+ if (test_data->use_external_mbufs) {
+ inbuf_info.free_cb = extbuf_free_callback;
+ inbuf_info.fcb_opaque = NULL;
+ rte_mbuf_ext_refcnt_set(&inbuf_info, 1);
+ for (i = 0; i < num_bufs; i++) {
+ rte_pktmbuf_attach_extbuf(uncomp_bufs[i],
+ test_data->inbuf_memzone->addr,
+ test_data->inbuf_memzone->iova,
+ test_data->inbuf_data_size,
+ &inbuf_info);
+ rte_pktmbuf_append(uncomp_bufs[i],
+ test_data->inbuf_data_size);
+ }
+ } else if (buff_type == SGL_BOTH || buff_type == SGL_TO_LB) {
for (i = 0; i < num_bufs; i++) {
data_size = strlen(test_bufs[i]) + 1;
if (prepare_sgl_bufs(test_bufs[i], uncomp_bufs[i],
@@ -813,7 +839,20 @@ test_deflate_comp_decomp(const struct interim_data_params *int_data,
goto exit;
}
- if (buff_type == SGL_BOTH || buff_type == LB_TO_SGL) {
+ if (test_data->use_external_mbufs) {
+ compbuf_info.free_cb = extbuf_free_callback;
+ compbuf_info.fcb_opaque = NULL;
+ rte_mbuf_ext_refcnt_set(&compbuf_info, 1);
+ for (i = 0; i < num_bufs; i++) {
+ rte_pktmbuf_attach_extbuf(comp_bufs[i],
+ test_data->compbuf_memzone->addr,
+ test_data->compbuf_memzone->iova,
+ test_data->compbuf_memzone->len,
+ &compbuf_info);
+ rte_pktmbuf_append(comp_bufs[i],
+ test_data->compbuf_memzone->len);
+ }
+ } else if (buff_type == SGL_BOTH || buff_type == LB_TO_SGL) {
for (i = 0; i < num_bufs; i++) {
if (out_of_space == 1 && oos_zlib_decompress)
data_size = OUT_OF_SPACE_BUF;
@@ -1041,7 +1080,20 @@ test_deflate_comp_decomp(const struct interim_data_params *int_data,
goto exit;
}
- if (buff_type == SGL_BOTH || buff_type == LB_TO_SGL) {
+ if (test_data->use_external_mbufs) {
+ decompbuf_info.free_cb = extbuf_free_callback;
+ decompbuf_info.fcb_opaque = NULL;
+ rte_mbuf_ext_refcnt_set(&decompbuf_info, 1);
+ for (i = 0; i < num_bufs; i++) {
+ rte_pktmbuf_attach_extbuf(uncomp_bufs[i],
+ test_data->uncompbuf_memzone->addr,
+ test_data->uncompbuf_memzone->iova,
+ test_data->uncompbuf_memzone->len,
+ &decompbuf_info);
+ rte_pktmbuf_append(uncomp_bufs[i],
+ test_data->uncompbuf_memzone->len);
+ }
+ } else if (buff_type == SGL_BOTH || buff_type == LB_TO_SGL) {
for (i = 0; i < num_bufs; i++) {
priv_data = (struct priv_op_data *)
(ops_processed[i] + 1);
@@ -1265,8 +1317,13 @@ test_deflate_comp_decomp(const struct interim_data_params *int_data,
*/
for (i = 0; i < num_bufs; i++) {
priv_data = (struct priv_op_data *)(ops_processed[i] + 1);
- const char *buf1 = test_bufs[priv_data->orig_idx];
+ const char *buf1 = test_data->use_external_mbufs ?
+ test_data->inbuf_memzone->addr :
+ test_bufs[priv_data->orig_idx];
const char *buf2;
+ data_size = test_data->use_external_mbufs ?
+ test_data->inbuf_data_size :
+ strlen(buf1) + 1;
contig_buf = rte_malloc(NULL, ops_processed[i]->produced, 0);
if (contig_buf == NULL) {
RTE_LOG(ERR, USER1, "Contiguous buffer could not "
@@ -1276,7 +1333,7 @@ test_deflate_comp_decomp(const struct interim_data_params *int_data,
buf2 = rte_pktmbuf_read(ops_processed[i]->m_dst, 0,
ops_processed[i]->produced, contig_buf);
- if (compare_buffers(buf1, strlen(buf1) + 1,
+ if (compare_buffers(buf1, data_size,
buf2, ops_processed[i]->produced) < 0)
goto exit;
@@ -1354,11 +1411,11 @@ test_compressdev_deflate_stateless_fixed(void)
};
struct test_data_params test_data = {
- RTE_COMP_OP_STATELESS,
- LB_BOTH,
- ZLIB_DECOMPRESS,
- 0,
- 0
+ .state = RTE_COMP_OP_STATELESS,
+ .buff_type = LB_BOTH,
+ .zlib_dir = ZLIB_DECOMPRESS,
+ .out_of_space = 0,
+ .big_data = 0
};
for (i = 0; i < RTE_DIM(compress_test_bufs); i++) {
@@ -1425,11 +1482,11 @@ test_compressdev_deflate_stateless_dynamic(void)
};
struct test_data_params test_data = {
- RTE_COMP_OP_STATELESS,
- LB_BOTH,
- ZLIB_DECOMPRESS,
- 0,
- 0
+ .state = RTE_COMP_OP_STATELESS,
+ .buff_type = LB_BOTH,
+ .zlib_dir = ZLIB_DECOMPRESS,
+ .out_of_space = 0,
+ .big_data = 0
};
for (i = 0; i < RTE_DIM(compress_test_bufs); i++) {
@@ -1479,11 +1536,11 @@ test_compressdev_deflate_stateless_multi_op(void)
};
struct test_data_params test_data = {
- RTE_COMP_OP_STATELESS,
- LB_BOTH,
- ZLIB_DECOMPRESS,
- 0,
- 0
+ .state = RTE_COMP_OP_STATELESS,
+ .buff_type = LB_BOTH,
+ .zlib_dir = ZLIB_DECOMPRESS,
+ .out_of_space = 0,
+ .big_data = 0
};
/* Compress with compressdev, decompress with Zlib */
@@ -1529,11 +1586,11 @@ test_compressdev_deflate_stateless_multi_level(void)
};
struct test_data_params test_data = {
- RTE_COMP_OP_STATELESS,
- LB_BOTH,
- ZLIB_DECOMPRESS,
- 0,
- 0
+ .state = RTE_COMP_OP_STATELESS,
+ .buff_type = LB_BOTH,
+ .zlib_dir = ZLIB_DECOMPRESS,
+ .out_of_space = 0,
+ .big_data = 0
};
for (i = 0; i < RTE_DIM(compress_test_bufs); i++) {
@@ -1619,11 +1676,11 @@ test_compressdev_deflate_stateless_multi_xform(void)
};
struct test_data_params test_data = {
- RTE_COMP_OP_STATELESS,
- LB_BOTH,
- ZLIB_DECOMPRESS,
- 0,
- 0
+ .state = RTE_COMP_OP_STATELESS,
+ .buff_type = LB_BOTH,
+ .zlib_dir = ZLIB_DECOMPRESS,
+ .out_of_space = 0,
+ .big_data = 0
};
/* Compress with compressdev, decompress with Zlib */
@@ -1665,11 +1722,11 @@ test_compressdev_deflate_stateless_sgl(void)
};
struct test_data_params test_data = {
- RTE_COMP_OP_STATELESS,
- SGL_BOTH,
- ZLIB_DECOMPRESS,
- 0,
- 0
+ .state = RTE_COMP_OP_STATELESS,
+ .buff_type = SGL_BOTH,
+ .zlib_dir = ZLIB_DECOMPRESS,
+ .out_of_space = 0,
+ .big_data = 0
};
for (i = 0; i < RTE_DIM(compress_test_bufs); i++) {
@@ -1773,11 +1830,11 @@ test_compressdev_deflate_stateless_checksum(void)
};
struct test_data_params test_data = {
- RTE_COMP_OP_STATELESS,
- LB_BOTH,
- ZLIB_DECOMPRESS,
- 0,
- 0
+ .state = RTE_COMP_OP_STATELESS,
+ .buff_type = LB_BOTH,
+ .zlib_dir = ZLIB_DECOMPRESS,
+ .out_of_space = 0,
+ .big_data = 0
};
/* Check if driver supports crc32 checksum and test */
@@ -1876,7 +1933,7 @@ test_compressdev_out_of_space_buffer(void)
uint16_t i;
const struct rte_compressdev_capabilities *capab;
- RTE_LOG(ERR, USER1, "This is a negative test errors are expected\n");
+ RTE_LOG(ERR, USER1, "This is a negative test, errors are expected\n");
capab = rte_compressdev_capability_get(0, RTE_COMP_ALGO_DEFLATE);
TEST_ASSERT(capab != NULL, "Failed to retrieve device capabilities");
@@ -1904,11 +1961,11 @@ test_compressdev_out_of_space_buffer(void)
};
struct test_data_params test_data = {
- RTE_COMP_OP_STATELESS,
- LB_BOTH,
- ZLIB_DECOMPRESS,
- 1, /* run out-of-space test */
- 0
+ .state = RTE_COMP_OP_STATELESS,
+ .buff_type = LB_BOTH,
+ .zlib_dir = ZLIB_DECOMPRESS,
+ .out_of_space = 1, /* run out-of-space test */
+ .big_data = 0
};
/* Compress with compressdev, decompress with Zlib */
test_data.zlib_dir = ZLIB_DECOMPRESS;
@@ -1985,11 +2042,11 @@ test_compressdev_deflate_stateless_dynamic_big(void)
};
struct test_data_params test_data = {
- RTE_COMP_OP_STATELESS,
- SGL_BOTH,
- ZLIB_DECOMPRESS,
- 0,
- 1
+ .state = RTE_COMP_OP_STATELESS,
+ .buff_type = SGL_BOTH,
+ .zlib_dir = ZLIB_DECOMPRESS,
+ .out_of_space = 0,
+ .big_data = 1
};
ts_params->def_comp_xform->compress.deflate.huffman =
@@ -2022,6 +2079,90 @@ test_compressdev_deflate_stateless_dynamic_big(void)
return ret;
}
+static const struct rte_memzone *
+make_memzone(const char *name, size_t size)
+{
+ unsigned int socket_id = rte_socket_id();
+ char mz_name[RTE_MEMZONE_NAMESIZE];
+ const struct rte_memzone *memzone;
+
+ snprintf(mz_name, RTE_MEMZONE_NAMESIZE, "%s_%u", name, socket_id);
+ memzone = rte_memzone_lookup(mz_name);
+ if (memzone != NULL && memzone->len != size) {
+ rte_memzone_free(memzone);
+ memzone = NULL;
+ }
+ if (memzone == NULL) {
+ memzone = rte_memzone_reserve_aligned(mz_name, size, socket_id,
+ RTE_MEMZONE_IOVA_CONTIG, RTE_CACHE_LINE_SIZE);
+ if (memzone == NULL)
+ RTE_LOG(ERR, USER1, "Can't allocate memory zone %s",
+ mz_name);
+ }
+ return memzone;
+}
+
+static int
+test_compressdev_external_mbufs(void)
+{
+ struct comp_testsuite_params *ts_params = &testsuite_params;
+ size_t data_len = 0;
+ uint16_t i;
+ int ret = TEST_FAILED;
+
+ for (i = 0; i < RTE_DIM(compress_test_bufs); i++)
+ data_len = RTE_MAX(data_len, strlen(compress_test_bufs[i]) + 1);
+
+ struct interim_data_params int_data = {
+ NULL,
+ 1,
+ NULL,
+ &ts_params->def_comp_xform,
+ &ts_params->def_decomp_xform,
+ 1
+ };
+
+ struct test_data_params test_data = {
+ .state = RTE_COMP_OP_STATELESS,
+ .buff_type = LB_BOTH,
+ .zlib_dir = ZLIB_DECOMPRESS,
+ .out_of_space = 0,
+ .big_data = 0,
+ .use_external_mbufs = 1,
+ .inbuf_data_size = data_len,
+ .inbuf_memzone = make_memzone("inbuf", data_len),
+ .compbuf_memzone = make_memzone("compbuf", data_len *
+ COMPRESS_BUF_SIZE_RATIO),
+ .uncompbuf_memzone = make_memzone("decompbuf", data_len)
+ };
+
+ for (i = 0; i < RTE_DIM(compress_test_bufs); i++) {
+ /* prepare input data */
+ data_len = strlen(compress_test_bufs[i]) + 1;
+ rte_memcpy(test_data.inbuf_memzone->addr, compress_test_bufs[i],
+ data_len);
+ test_data.inbuf_data_size = data_len;
+ int_data.buf_idx = &i;
+
+ /* Compress with compressdev, decompress with Zlib */
+ test_data.zlib_dir = ZLIB_DECOMPRESS;
+ if (test_deflate_comp_decomp(&int_data, &test_data) < 0)
+ goto exit;
+
+ /* Compress with Zlib, decompress with compressdev */
+ test_data.zlib_dir = ZLIB_COMPRESS;
+ if (test_deflate_comp_decomp(&int_data, &test_data) < 0)
+ goto exit;
+ }
+
+ ret = TEST_SUCCESS;
+
+exit:
+ rte_memzone_free(test_data.inbuf_memzone);
+ rte_memzone_free(test_data.compbuf_memzone);
+ rte_memzone_free(test_data.uncompbuf_memzone);
+ return ret;
+}
static struct unit_test_suite compressdev_testsuite = {
.suite_name = "compressdev unit test suite",
@@ -2048,6 +2189,8 @@ static struct unit_test_suite compressdev_testsuite = {
test_compressdev_deflate_stateless_checksum),
TEST_CASE_ST(generic_ut_setup, generic_ut_teardown,
test_compressdev_out_of_space_buffer),
+ TEST_CASE_ST(generic_ut_setup, generic_ut_teardown,
+ test_compressdev_external_mbufs),
TEST_CASES_END() /**< NULL terminate unit test array */
}
};
--
2.17.1
next prev parent reply other threads:[~2019-09-03 9:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-03 9:43 [dpdk-dev] [PATCH 0/2] Add external mbufs option Adam Dybkowski
2019-09-03 9:43 ` Adam Dybkowski [this message]
2019-09-24 13:05 ` [dpdk-dev] [PATCH 1/2] test/compress: add external buffer in mbuf API test Trahe, Fiona
2019-09-03 9:43 ` [dpdk-dev] [PATCH 2/2] app/compress-perf: add external mbufs option Adam Dybkowski
2019-09-24 12:52 ` Trahe, Fiona
2019-09-24 14:10 ` [dpdk-dev] [PATCH v2 0/2] Add " Adam Dybkowski
2019-09-24 14:10 ` [dpdk-dev] [PATCH v2 1/2] test/compress: add external buffer in mbuf API test Adam Dybkowski
2019-09-24 14:10 ` [dpdk-dev] [PATCH v2 2/2] app/compress-perf: add external mbufs option Adam Dybkowski
2019-09-24 16:47 ` [dpdk-dev] [PATCH v2 0/2] Add " Trahe, Fiona
2019-09-27 14:50 ` Akhil Goyal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190903094312.8780-2-adamx.dybkowski@intel.com \
--to=adamx.dybkowski@intel.com \
--cc=arturx.trybula@intel.com \
--cc=dev@dpdk.org \
--cc=fiona.trahe@intel.com \
--cc=pablo.de.lara.guarch@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).