From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DC693427EF for ; Wed, 22 Mar 2023 11:32:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D9B3142BDA; Wed, 22 Mar 2023 11:32:34 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id C564A42B7E for ; Wed, 22 Mar 2023 11:32:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679481153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ownOYdWmBwGgBk505hyT0cNvpIjabh064zNLQg0BLnc=; b=hBqdbPhBorL+omDI01vdF6+SHtB1cYGm+5mqlYKFMPpYNtZThr3rRDmFmZw3rqYpjE7DAq uwTxrsRoNyApN+v5stMGGrc1sxyK+DCl+ZK0KLVAeY2uT14kXe7CChMrBflW0oTZsaNSmk 7sV4ASV3T0wnTZRo9J8YZv3DH2o2uH0= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-642-efD_gayJMOelTnSzHGvnkQ-1; Wed, 22 Mar 2023 06:32:28 -0400 X-MC-Unique: efD_gayJMOelTnSzHGvnkQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0412F1C07549; Wed, 22 Mar 2023 10:32:28 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.69]) by smtp.corp.redhat.com (Postfix) with ESMTP id E653E492C13; Wed, 22 Mar 2023 10:32:26 +0000 (UTC) From: Kevin Traynor To: Arkadiusz Kusztal Cc: Ciara Power , Kai Ji , dpdk stable Subject: patch 'app/compress-perf: fix remaining data for ops' has been queued to stable release 21.11.4 Date: Wed, 22 Mar 2023 10:31:54 +0000 Message-Id: <20230322103209.456098-7-ktraynor@redhat.com> In-Reply-To: <20230322103209.456098-1-ktraynor@redhat.com> References: <20230322103209.456098-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/24/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/9daf33a2374292c161fe617dc8ee1aef81456ab2 Thanks. Kevin --- >From 9daf33a2374292c161fe617dc8ee1aef81456ab2 Mon Sep 17 00:00:00 2001 From: Arkadiusz Kusztal Date: Fri, 10 Mar 2023 16:27:05 +0000 Subject: [PATCH] app/compress-perf: fix remaining data for ops [ upstream commit cf8c0c65514a12d4f326417f7cf54433338ed226 ] Individual variables are needed for tracking the remaining data for compression and decompression. Fixes: 83cc3b90ad7a ("app/compress-perf: fix testing single operation") Signed-off-by: Arkadiusz Kusztal Signed-off-by: Ciara Power Acked-by: Kai Ji --- app/test-compress-perf/comp_perf_test_common.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/test-compress-perf/comp_perf_test_common.c b/app/test-compress-perf/comp_perf_test_common.c index cd60958944..78487196ad 100644 --- a/app/test-compress-perf/comp_perf_test_common.c +++ b/app/test-compress-perf/comp_perf_test_common.c @@ -367,4 +367,5 @@ prepare_bufs(struct comp_test_data *test_data, struct cperf_mem_resources *mem) { uint32_t remaining_data = test_data->input_data_sz; + uint32_t remaining_data_decomp = test_data->input_data_sz; uint8_t *input_data_ptr = test_data->input_data; size_t data_sz = 0; @@ -483,5 +484,5 @@ prepare_bufs(struct comp_test_data *test_data, struct cperf_mem_resources *mem) if (decompress_only) - data_sz = RTE_MIN(remaining_data, test_data->seg_sz); + data_sz = RTE_MIN(remaining_data_decomp, test_data->seg_sz); else data_sz = test_data->out_seg_sz; @@ -497,9 +498,9 @@ prepare_bufs(struct comp_test_data *test_data, struct cperf_mem_resources *mem) rte_memcpy(data_addr, input_data_ptr, data_sz); input_data_ptr += data_sz; - remaining_data -= data_sz; + remaining_data_decomp -= data_sz; } /* Chain mbufs if needed for output mbufs */ - for (j = 1; j < segs_per_mbuf && remaining_data > 0; j++) { + for (j = 1; j < segs_per_mbuf && remaining_data_decomp > 0; j++) { struct rte_mbuf *next_seg = rte_pktmbuf_alloc(mem->comp_buf_pool); @@ -522,5 +523,5 @@ prepare_bufs(struct comp_test_data *test_data, struct cperf_mem_resources *mem) if (decompress_only) - data_sz = RTE_MIN(remaining_data, + data_sz = RTE_MIN(remaining_data_decomp, test_data->seg_sz); else @@ -537,5 +538,5 @@ prepare_bufs(struct comp_test_data *test_data, struct cperf_mem_resources *mem) rte_memcpy(data_addr, input_data_ptr, data_sz); input_data_ptr += data_sz; - remaining_data -= data_sz; + remaining_data_decomp -= data_sz; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-22 10:30:08.110123544 +0000 +++ 0007-app-compress-perf-fix-remaining-data-for-ops.patch 2023-03-22 10:30:07.906866554 +0000 @@ -1 +1 @@ -From cf8c0c65514a12d4f326417f7cf54433338ed226 Mon Sep 17 00:00:00 2001 +From 9daf33a2374292c161fe617dc8ee1aef81456ab2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cf8c0c65514a12d4f326417f7cf54433338ed226 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org