Add external mbufs option
cover Add external mbufs option
This patchset adds a unit test of the external buffers functionality and adds a new option to the compression performance benchmark tool to use memzones as external buffers instead of the data put directly inside mbufs.
Adam Dybkowski (2):
test/compress: add external buffer in mbuf API test app/compress-perf: add external mbufs option
app/test-compress-perf/comp_perf_options.h | 2 + .../comp_perf_options_parse.c | 15 ++ .../comp_perf_test_benchmark.c | 3 +- .../comp_perf_test_common.c | 201 +++++++++++++- .../comp_perf_test_common.h | 9 +- .../comp_perf_test_verify.c | 4 +- app/test/test_compressdev.c | 245 ++++++++++++++---- 7 files changed, 416 insertions(+), 63 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 test/compress: add external buffer in mbuf API test
Adds a new test to verify external buffer in mbuf APIs. Initialize fields in test_data_params structures by name for better readability.
--- app/test/test_compressdev.c | 245 ++++++++++++++++++++++++++++-------- 1 file changed, 194 insertions(+), 51 deletions(-)
app/test/test_compressdev.c +194 -51
@@ -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 */ } };
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH 1/2] test/compress: add external buffer in mbuf API test
Quoted 10 lines
-----Original Message-----
From: Dybkowski, AdamX
Sent: Tuesday, September 3, 2019 10:43 AM
To: [email protected]; Trahe, Fiona <[email protected]>; De Lara Guarch, Pablo <[email protected]>; Trybula, ArturX <[email protected]>
Cc: Dybkowski, AdamX <[email protected]>
Subject: [PATCH 1/2] test/compress: add external buffer in mbuf API test
Quoted 5 lines
Adds a new test to verify external buffer in mbuf APIs. Initialize fields in
test_data_paramsstructures by name for better readability.Signed-off-by Adam Dybkowski <[email protected]>
PATCH 2/2 app/compress-perf: add external mbufs option
In reply to Adam DybkowskiThis patch adds new performance measurement option --external-mbufs that allocates and uses memzones as external buffers instead of putting the data directly inside mbufs.
--- app/test-compress-perf/comp_perf_options.h | 2 + .../comp_perf_options_parse.c | 15 ++ .../comp_perf_test_benchmark.c | 3 +- .../comp_perf_test_common.c | 201 +++++++++++++++++- .../comp_perf_test_common.h | 9 +- .../comp_perf_test_verify.c | 4 +- 6 files changed, 222 insertions(+), 12 deletions(-)
app/test-compress-perf/comp_perf_options.h +2 -0
@@ -56,12 +56,14 @@ struct comp_test_data {uint32_t pool_sz;uint32_t num_iter;uint16_t max_sgl_segs; +uint32_t total_segs;enum rte_comp_huffman huffman_enc;enum comp_operation test_op;int window_sz;struct range_list level_lst;uint8_t level; +int use_external_mbufs;double ratio;enum cleanup_st cleanup;
app/test-compress-perf/comp_perf_options_parse.c +15 -0
@@ -28,6 +28,7 @@#define CPERF_HUFFMAN_ENC ("huffman-enc")#define CPERF_LEVEL ("compress-level")#define CPERF_WINDOW_SIZE ("window-sz") +#define CPERF_EXTERNAL_MBUFS ("external-mbufs")struct name_id_map {const char *name;
@@ -58,6 +59,8 @@ usage(char *progname)" (default: range between 1 and 9)\n" " --window-sz N: base two log value of compression window size\n" " (e.g.: 15 => 32k, default: max supported by PMD)\n" +" --external-mbufs: use memzones as external buffers instead of\n" +" keeping the data directly in mbuf area\n" " -h: prints this help\n" , progname); }
@@ -520,6 +523,14 @@ parse_level(struct comp_test_data *test_data, const char *arg)return 0 ; } +static int +parse_external_mbufs (struct comp_test_data *test_data, + const char *arg __rte_unused) +{ + test_data->use_external_mbufs =1 ; +return 0 ; +} +typedef int (*option_parser_t )(struct comp_test_data *test_data,const char *arg);
@@ -544,8 +555,10 @@ static struct option lgopts[] = { { CPERF_HUFFMAN_ENC, required_argument, 0, 0 }, { CPERF_LEVEL, required_argument, 0, 0 }, { CPERF_WINDOW_SIZE, required_argument, 0, 0 }, + { CPERF_EXTERNAL_MBUFS, 0, 0, 0 }, { NULL, 0, 0, 0 } }; +static int comp_perf_opts_parse_long (int opt_idx,struct comp_test_data *test_data) {
@@ -563,6 +576,7 @@ comp_perf_opts_parse_long(int opt_idx, struct comp_test_data *test_data) { CPERF_HUFFMAN_ENC, parse_huffman_enc }, { CPERF_LEVEL, parse_level }, { CPERF_WINDOW_SIZE, parse_window_sz }, + { CPERF_EXTERNAL_MBUFS, parse_external_mbufs }, };unsigned int i;
@@ -618,6 +632,7 @@ comp_perf_options_default(struct comp_test_data *test_data) test_data->level_lst.max =RTE_COMP_LEVEL_MAX ; test_data->level_lst.inc =1 ; test_data->test =CPERF_TEST_TYPE_BENCHMARK ; + test_data->use_external_mbufs =0 ; }int
app/test-compress-perf/comp_perf_test_benchmark.c +2 -1
@@ -15,7 +15,8 @@ cperf_benchmark_test_destructor(void *arg) {if (arg) {comp_perf_free_memory ( - &((struct cperf_benchmark_ctx *)arg)->ver.mem); + ((struct cperf_benchmark_ctx *)arg)->ver.options, + &((struct cperf_benchmark_ctx *)arg)->ver.mem);rte_free (arg); } }
app/test-compress-perf/comp_perf_test_common.c +192 -9
284 lines not on this page · raw message
app/test-compress-perf/comp_perf_test_common.h +8 -1
@@ -26,13 +26,20 @@ struct cperf_mem_resources {struct rte_mempool *comp_buf_pool;struct rte_mempool *decomp_buf_pool;struct rte_mempool *op_pool; + +/* external mbuf support */ +const struct rte_memzone **comp_memzones; +const struct rte_memzone **decomp_memzones; +struct rte_mbuf_ext_shared_info *comp_buf_infos; +struct rte_mbuf_ext_shared_info *decomp_buf_infos; };int param_range_check (uint16_t size,const struct rte_param_log2_range *range);void -comp_perf_free_memory (struct cperf_mem_resources *mem); +comp_perf_free_memory (struct comp_test_data *test_data, +struct cperf_mem_resources *mem); int comp_perf_allocate_memory(struct comp_test_data *test_data,
app/test-compress-perf/comp_perf_test_verify.c +3 -1
@@ -14,7 +14,9 @@ void cperf_verify_test_destructor(void *arg) {if (arg) { -comp_perf_free_memory (&((struct cperf_verify_ctx *)arg)->mem); +comp_perf_free_memory ( + ((struct cperf_verify_ctx *)arg)->options, + &((struct cperf_verify_ctx *)arg)->mem);rte_free (arg); } }
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH 2/2] app/compress-perf: add external mbufs option
Quoted 10 lines
-----Original Message-----
From: Dybkowski, AdamX
Sent: Tuesday, September 3, 2019 10:43 AM
To: [email protected]; Trahe, Fiona <[email protected]>; De Lara Guarch, Pablo <[email protected]>; Trybula, ArturX <[email protected]>
Cc: Dybkowski, AdamX <[email protected]>
Subject: [PATCH 2/2] app/compress-perf: add external mbufs option
Quoted 5 lines
This patch adds new performance measurement option --external-mbufs that allocates and uses memzones as external buffers instead of putting the data directly inside mbufs.
Signed-off-by Adam Dybkowski <[email protected]>
v2 cover Add external mbufs option
In reply to Adam DybkowskiThis patchset adds a unit test of the external buffers functionality and a new option to the compression performance benchmark tool to use memzones as external buffers instead of the data put directly inside mbufs.
---
v2:
* Rebasing over the stateful decompression patch
This patch depends on https://patches.dpdk.org/cover/59610/
Adam Dybkowski (2):
test/compress: add external buffer in mbuf API test app/compress-perf: add external mbufs option
app/test-compress-perf/comp_perf_options.h | 2 + .../comp_perf_options_parse.c | 15 + .../comp_perf_test_benchmark.c | 3 +- .../comp_perf_test_common.c | 201 ++++++++++- .../comp_perf_test_common.h | 9 +- .../comp_perf_test_verify.c | 4 +- app/test/test_compressdev.c | 314 ++++++++++++------ 7 files changed, 443 insertions(+), 105 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/2 test/compress: add external buffer in mbuf API test
Adds a new test to verify external buffer in mbuf APIs. Initialize fields in test_data_params structures by name for better readability.
--- app/test/test_compressdev.c | 314 +++++++++++++++++++++++++----------- 1 file changed, 221 insertions(+), 93 deletions(-)
app/test/test_compressdev.c +221 -93
@@ -104,6 +104,12 @@ struct test_data_params {/* stateful decompression specific parameters */ unsigned int decompress_output_block_size;unsigned int decompress_steps_max; +/* external mbufs specific parameters */ +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 };
@@ -714,6 +720,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 */
@@ -735,6 +746,9 @@ test_deflate_comp_decomp(const struct interim_data_params *int_data,unsigned int big_data = test_data->big_data;enum zlib_direction zlib_dir = test_data->zlib_dir;int ret_status =TEST_FAILED ; +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;struct rte_mbuf *uncomp_bufs[num_bufs];struct rte_mbuf *comp_bufs[num_bufs];
@@ -803,7 +817,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],
@@ -831,7 +858,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 ;
@@ -1058,7 +1098,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 );
@@ -1386,8 +1439,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 "
@@ -1397,7 +1455,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;
@@ -1478,14 +1536,12 @@ test_compressdev_deflate_stateless_fixed(void) };struct test_data_params test_data = { -RTE_COMP_OP_STATELESS , -RTE_COMP_OP_STATELESS , -LB_BOTH , -ZLIB_DECOMPRESS , -0 , -0 , -0 , -0 + .compress_state =RTE_COMP_OP_STATELESS , + .decompress_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++) {
@@ -1550,14 +1606,12 @@ test_compressdev_deflate_stateless_dynamic(void) };struct test_data_params test_data = { -RTE_COMP_OP_STATELESS , -RTE_COMP_OP_STATELESS , -LB_BOTH , -ZLIB_DECOMPRESS , -0 , -0 , -0 , -0 + .compress_state =RTE_COMP_OP_STATELESS , + .decompress_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++) {
@@ -1606,14 +1660,12 @@ test_compressdev_deflate_stateless_multi_op(void) };struct test_data_params test_data = { -RTE_COMP_OP_STATELESS , -RTE_COMP_OP_STATELESS , -LB_BOTH , -ZLIB_DECOMPRESS , -0 , -0 , -0 , -0 + .compress_state =RTE_COMP_OP_STATELESS , + .decompress_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 */
@@ -1661,14 +1713,12 @@ test_compressdev_deflate_stateless_multi_level(void) };struct test_data_params test_data = { -RTE_COMP_OP_STATELESS , -RTE_COMP_OP_STATELESS , -LB_BOTH , -ZLIB_DECOMPRESS , -0 , -0 , -0 , -0 + .compress_state =RTE_COMP_OP_STATELESS , + .decompress_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++) {
@@ -1752,14 +1802,12 @@ test_compressdev_deflate_stateless_multi_xform(void) };struct test_data_params test_data = { -RTE_COMP_OP_STATELESS , -RTE_COMP_OP_STATELESS , -LB_BOTH , -ZLIB_DECOMPRESS , -0 , -0 , -0 , -0 + .compress_state =RTE_COMP_OP_STATELESS , + .decompress_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 */
@@ -1802,14 +1850,12 @@ test_compressdev_deflate_stateless_sgl(void) };struct test_data_params test_data = { -RTE_COMP_OP_STATELESS , -RTE_COMP_OP_STATELESS , -SGL_BOTH , -ZLIB_DECOMPRESS , -0 , -0 , -0 , -0 + .compress_state =RTE_COMP_OP_STATELESS , + .decompress_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++) {
@@ -1914,14 +1960,12 @@ test_compressdev_deflate_stateless_checksum(void) };struct test_data_params test_data = { -RTE_COMP_OP_STATELESS , -RTE_COMP_OP_STATELESS , -LB_BOTH , -ZLIB_DECOMPRESS , -0 , -0 , -0 , -0 + .compress_state =RTE_COMP_OP_STATELESS , + .decompress_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 */
@@ -2033,14 +2077,12 @@ test_compressdev_out_of_space_buffer(void) };struct test_data_params test_data = { -RTE_COMP_OP_STATELESS , -RTE_COMP_OP_STATELESS , -LB_BOTH , -ZLIB_DECOMPRESS , -1 ,/* run out-of-space test */ -0 , -0 , -0 + .compress_state =RTE_COMP_OP_STATELESS , + .decompress_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 ;
@@ -2112,14 +2154,12 @@ test_compressdev_deflate_stateless_dynamic_big(void) };struct test_data_params test_data = { -RTE_COMP_OP_STATELESS , -RTE_COMP_OP_STATELESS , -SGL_BOTH , -ZLIB_DECOMPRESS , -0 , -1 , -0 , -0 + .compress_state =RTE_COMP_OP_STATELESS , + .decompress_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 =
@@ -2176,14 +2216,14 @@ test_compressdev_deflate_stateful_decomp(void) };struct test_data_params test_data = { -RTE_COMP_OP_STATELESS , -RTE_COMP_OP_STATEFUL , -LB_BOTH , -ZLIB_COMPRESS , -0 , -0 , -2000 , -4 + .compress_state =RTE_COMP_OP_STATELESS , + .decompress_state =RTE_COMP_OP_STATEFUL , + .buff_type =LB_BOTH , + .zlib_dir =ZLIB_COMPRESS , + .out_of_space =0 , + .big_data =0 , + .decompress_output_block_size =2000 , + .decompress_steps_max =4 };/* Compress with Zlib, decompress with compressdev */
@@ -2258,14 +2298,14 @@ test_compressdev_deflate_stateful_decomp_checksum(void) };struct test_data_params test_data = { -RTE_COMP_OP_STATELESS , -RTE_COMP_OP_STATEFUL , -LB_BOTH , -ZLIB_COMPRESS , -0 , -0 , -2000 , -4 + .compress_state =RTE_COMP_OP_STATELESS , + .decompress_state =RTE_COMP_OP_STATEFUL , + .buff_type =LB_BOTH , + .zlib_dir =ZLIB_COMPRESS , + .out_of_space =0 , + .big_data =0 , + .decompress_output_block_size =2000 , + .decompress_steps_max =4 };/* Check if driver supports crc32 checksum and test */
@@ -2346,6 +2386,92 @@ test_compressdev_deflate_stateful_decomp_checksum(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 = { + .compress_state =RTE_COMP_OP_STATELESS , + .decompress_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" , .setup = testsuite_setup,
@@ -2375,6 +2501,8 @@ static struct unit_test_suite compressdev_testsuite = { test_compressdev_deflate_stateful_decomp),TEST_CASE_ST (generic_ut_setup, generic_ut_teardown, test_compressdev_deflate_stateful_decomp_checksum), +TEST_CASE_ST (generic_ut_setup, generic_ut_teardown, + test_compressdev_external_mbufs), TEST_CASES_END() /**< NULL terminate unit test array */ } };
Signature · 1 line
2.17.1
PATCH v2 2/2 app/compress-perf: add external mbufs option
In reply to Adam DybkowskiThis patch adds new performance measurement option --external-mbufs that allocates and uses memzones as external buffers instead of putting the data directly inside mbufs.
--- app/test-compress-perf/comp_perf_options.h | 2 + .../comp_perf_options_parse.c | 15 ++ .../comp_perf_test_benchmark.c | 3 +- .../comp_perf_test_common.c | 201 +++++++++++++++++- .../comp_perf_test_common.h | 9 +- .../comp_perf_test_verify.c | 4 +- 6 files changed, 222 insertions(+), 12 deletions(-)
app/test-compress-perf/comp_perf_options.h +2 -0
@@ -56,12 +56,14 @@ struct comp_test_data {uint32_t pool_sz;uint32_t num_iter;uint16_t max_sgl_segs; +uint32_t total_segs;enum rte_comp_huffman huffman_enc;enum comp_operation test_op;int window_sz;struct range_list level_lst;uint8_t level; +int use_external_mbufs;double ratio;enum cleanup_st cleanup;
app/test-compress-perf/comp_perf_options_parse.c +15 -0
@@ -28,6 +28,7 @@#define CPERF_HUFFMAN_ENC ("huffman-enc")#define CPERF_LEVEL ("compress-level")#define CPERF_WINDOW_SIZE ("window-sz") +#define CPERF_EXTERNAL_MBUFS ("external-mbufs")struct name_id_map {const char *name;
@@ -58,6 +59,8 @@ usage(char *progname)" (default: range between 1 and 9)\n" " --window-sz N: base two log value of compression window size\n" " (e.g.: 15 => 32k, default: max supported by PMD)\n" +" --external-mbufs: use memzones as external buffers instead of\n" +" keeping the data directly in mbuf area\n" " -h: prints this help\n" , progname); }
@@ -520,6 +523,14 @@ parse_level(struct comp_test_data *test_data, const char *arg)return 0 ; } +static int +parse_external_mbufs (struct comp_test_data *test_data, + const char *arg __rte_unused) +{ + test_data->use_external_mbufs =1 ; +return 0 ; +} +typedef int (*option_parser_t )(struct comp_test_data *test_data,const char *arg);
@@ -544,8 +555,10 @@ static struct option lgopts[] = { { CPERF_HUFFMAN_ENC, required_argument, 0, 0 }, { CPERF_LEVEL, required_argument, 0, 0 }, { CPERF_WINDOW_SIZE, required_argument, 0, 0 }, + { CPERF_EXTERNAL_MBUFS, 0, 0, 0 }, { NULL, 0, 0, 0 } }; +static int comp_perf_opts_parse_long (int opt_idx,struct comp_test_data *test_data) {
@@ -563,6 +576,7 @@ comp_perf_opts_parse_long(int opt_idx, struct comp_test_data *test_data) { CPERF_HUFFMAN_ENC, parse_huffman_enc }, { CPERF_LEVEL, parse_level }, { CPERF_WINDOW_SIZE, parse_window_sz }, + { CPERF_EXTERNAL_MBUFS, parse_external_mbufs }, };unsigned int i;
@@ -618,6 +632,7 @@ comp_perf_options_default(struct comp_test_data *test_data) test_data->level_lst.max =RTE_COMP_LEVEL_MAX ; test_data->level_lst.inc =1 ; test_data->test =CPERF_TEST_TYPE_BENCHMARK ; + test_data->use_external_mbufs =0 ; }int
app/test-compress-perf/comp_perf_test_benchmark.c +2 -1
@@ -15,7 +15,8 @@ cperf_benchmark_test_destructor(void *arg) {if (arg) {comp_perf_free_memory ( - &((struct cperf_benchmark_ctx *)arg)->ver.mem); + ((struct cperf_benchmark_ctx *)arg)->ver.options, + &((struct cperf_benchmark_ctx *)arg)->ver.mem);rte_free (arg); } }
app/test-compress-perf/comp_perf_test_common.c +192 -9
284 lines not on this page · raw message
app/test-compress-perf/comp_perf_test_common.h +8 -1
@@ -26,13 +26,20 @@ struct cperf_mem_resources {struct rte_mempool *comp_buf_pool;struct rte_mempool *decomp_buf_pool;struct rte_mempool *op_pool; + +/* external mbuf support */ +const struct rte_memzone **comp_memzones; +const struct rte_memzone **decomp_memzones; +struct rte_mbuf_ext_shared_info *comp_buf_infos; +struct rte_mbuf_ext_shared_info *decomp_buf_infos; };int param_range_check (uint16_t size,const struct rte_param_log2_range *range);void -comp_perf_free_memory (struct cperf_mem_resources *mem); +comp_perf_free_memory (struct comp_test_data *test_data, +struct cperf_mem_resources *mem); int comp_perf_allocate_memory(struct comp_test_data *test_data,
app/test-compress-perf/comp_perf_test_verify.c +3 -1
@@ -14,7 +14,9 @@ void cperf_verify_test_destructor(void *arg) {if (arg) { -comp_perf_free_memory (&((struct cperf_verify_ctx *)arg)->mem); +comp_perf_free_memory ( + ((struct cperf_verify_ctx *)arg)->options, + &((struct cperf_verify_ctx *)arg)->mem);rte_free (arg); } }
Signature · 1 line
2.17.1
Quoted 33 lines
-----Original Message-----
From: Dybkowski, AdamX
Sent: Tuesday, September 24, 2019 3:11 PM
To: [email protected]; Trahe, Fiona <[email protected]>; Trybula, ArturX <[email protected]>; [email protected]
Cc: Dybkowski, AdamX <[email protected]>
Subject: [PATCH v2 0/2] Add external mbufs optionThis patchset adds a unit test of the external buffers functionality and a new option to the compression performance benchmark tool to use memzones as external buffers instead of the data put directly inside mbufs.
---
v2:
* Rebasing over the stateful decompression patchThis patch depends on https://patches.dpdk.org/cover/59610/
Adam Dybkowski (2):
test/compress: add external buffer in mbuf API test app/compress-perf: add external mbufs optionapp/test-compress-perf/comp_perf_options.h | 2 + .../comp_perf_options_parse.c | 15 + .../comp_perf_test_benchmark.c | 3 +- .../comp_perf_test_common.c | 201 ++++++++++- .../comp_perf_test_common.h | 9 +- .../comp_perf_test_verify.c | 4 +- app/test/test_compressdev.c | 314 ++++++++++++------ 7 files changed, 443 insertions(+), 105 deletions(-)
Quoted 2 lines
--
2.17.1
Series
Akhil Goyal
AppliedQuoted 13 lines
Quoted 13 lines
Adam Dybkowski (2):
test/compress: add external buffer in mbuf API test app/compress-perf: add external mbufs optionapp/test-compress-perf/comp_perf_options.h | 2 + .../comp_perf_options_parse.c | 15 + .../comp_perf_test_benchmark.c | 3 +- .../comp_perf_test_common.c | 201 ++++++++++- .../comp_perf_test_common.h | 9 +- .../comp_perf_test_verify.c | 4 +- app/test/test_compressdev.c | 314 ++++++++++++------ 7 files changed, 443 insertions(+), 105 deletions(-)
Quoted 4 lines
Quoted 2 lines
--
2.17.1Series
Acked-by Fiona Trahe <[email protected]>
Applied to dpdk-next-crypto
Thanks.