From patchwork Tue Jul 23 09:53:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dybkowski, AdamX" X-Patchwork-Id: 56961 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B35D51BEF7; Tue, 23 Jul 2019 12:06:09 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id CDBB11BE6B for ; Tue, 23 Jul 2019 12:06:07 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Jul 2019 03:06:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,298,1559545200"; d="scan'208";a="188809514" Received: from adamdybx-mobl.ger.corp.intel.com (HELO localhost.localdomain) ([10.104.14.181]) by fmsmga001.fm.intel.com with ESMTP; 23 Jul 2019 03:06:06 -0700 From: Adam Dybkowski To: dev@dpdk.org, fiona.trahe@intel.com, akhil.goyal@nxp.com Cc: Adam Dybkowski Date: Tue, 23 Jul 2019 11:53:28 +0200 Message-Id: <20190723095328.23236-1-adamx.dybkowski@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH] app/compress-perf: prevent output buffer overflow X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch fixes the issue of memory overwrite after the end of the output buffer by calculating its size as the number of all segments multipled by the output segment size. Additionally buffer overflow errors returned by PMD driver are detected and shown, ending the test. Also the output buffer size multiplier was increased from 105% to 110% to allow running the tests on noncompressible files that expand to over 107% of original size during the compression. The changes were made in the verification part of the flow and they don't affect the benchmark results. Fixes: 424dd6c8c1 ("app/compress-perf: add weak functions for multicore test") Signed-off-by: Adam Dybkowski Acked-by: Fiona Trahe --- app/test-compress-perf/comp_perf_options.h | 2 +- .../comp_perf_test_common.c | 7 +++--- .../comp_perf_test_verify.c | 23 ++++++++++++++++--- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/app/test-compress-perf/comp_perf_options.h b/app/test-compress-perf/comp_perf_options.h index 5a32ed3a6..651cbea4e 100644 --- a/app/test-compress-perf/comp_perf_options.h +++ b/app/test-compress-perf/comp_perf_options.h @@ -7,7 +7,7 @@ #define MAX_LIST 32 #define MIN_COMPRESSED_BUF_SIZE 8 -#define EXPANSE_RATIO 1.05 +#define EXPANSE_RATIO 1.1 #define MAX_MBUF_DATA_SIZE (UINT16_MAX - RTE_PKTMBUF_HEADROOM) #define MAX_SEG_SIZE ((int)(MAX_MBUF_DATA_SIZE / EXPANSE_RATIO)) diff --git a/app/test-compress-perf/comp_perf_test_common.c b/app/test-compress-perf/comp_perf_test_common.c index 472c76686..c9bf6c5b1 100644 --- a/app/test-compress-perf/comp_perf_test_common.c +++ b/app/test-compress-perf/comp_perf_test_common.c @@ -135,8 +135,10 @@ comp_perf_allocate_memory(struct comp_test_data *test_data, * if data cannot be compressed */ mem->compressed_data = rte_zmalloc_socket(NULL, - test_data->input_data_sz * EXPANSE_RATIO - + MIN_COMPRESSED_BUF_SIZE, 0, + RTE_MAX( + (size_t) test_data->out_seg_sz * total_segs, + (size_t) MIN_COMPRESSED_BUF_SIZE), + 0, rte_socket_id()); if (mem->compressed_data == NULL) { RTE_LOG(ERR, USER1, "Memory to hold the data from the input " @@ -267,7 +269,6 @@ prepare_bufs(struct comp_test_data *test_data, struct cperf_mem_resources *mem) data_addr = (uint8_t *)rte_pktmbuf_append(next_seg, test_data->out_seg_sz); - if (data_addr == NULL) { RTE_LOG(ERR, USER1, "Could not append data\n"); return -1; diff --git a/app/test-compress-perf/comp_perf_test_verify.c b/app/test-compress-perf/comp_perf_test_verify.c index 37ac38da6..f66f95ff7 100644 --- a/app/test-compress-perf/comp_perf_test_verify.c +++ b/app/test-compress-perf/comp_perf_test_verify.c @@ -217,7 +217,16 @@ main_loop(struct cperf_verify_ctx *ctx, enum rte_comp_xform_type type) for (i = 0; i < num_deq; i++) { struct rte_comp_op *op = deq_ops[i]; - if (op->status != RTE_COMP_OP_STATUS_SUCCESS) { + if (op->status == + RTE_COMP_OP_STATUS_OUT_OF_SPACE_TERMINATED || + op->status == + RTE_COMP_OP_STATUS_OUT_OF_SPACE_RECOVERABLE) { + RTE_LOG(ERR, USER1, +"Out of space error occurred due to uncompressible input data expanding to larger than destination buffer. Increase the EXPANSE_RATIO constant to use this data.\n"); + res = -1; + goto end; + } else if (op->status != + RTE_COMP_OP_STATUS_SUCCESS) { RTE_LOG(ERR, USER1, "Some operations were not successful\n"); goto end; @@ -293,12 +302,20 @@ main_loop(struct cperf_verify_ctx *ctx, enum rte_comp_xform_type type) for (i = 0; i < num_deq; i++) { struct rte_comp_op *op = deq_ops[i]; - if (op->status != RTE_COMP_OP_STATUS_SUCCESS) { + if (op->status == + RTE_COMP_OP_STATUS_OUT_OF_SPACE_TERMINATED || + op->status == + RTE_COMP_OP_STATUS_OUT_OF_SPACE_RECOVERABLE) { + RTE_LOG(ERR, USER1, +"Out of space error occurred due to uncompressible input data expanding to larger than destination buffer. Increase the EXPANSE_RATIO constant to use this data.\n"); + res = -1; + goto end; + } else if (op->status != + RTE_COMP_OP_STATUS_SUCCESS) { RTE_LOG(ERR, USER1, "Some operations were not successful\n"); goto end; } - const void *read_data_addr = rte_pktmbuf_read(op->m_dst, op->dst.offset,