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 7DDA442800 for ; Wed, 22 Mar 2023 01:42:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 75D1040F18; Wed, 22 Mar 2023 01:42:19 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id 993B440F18 for ; Wed, 22 Mar 2023 01:42:16 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id i5-20020a05600c354500b003edd24054e0so5310258wmq.4 for ; Tue, 21 Mar 2023 17:42:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679445736; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Wb6h71xoxHJBZa+1PckiombGuAH8pAtkT2htYeArv2E=; b=W8g02OuY43g3B3MzphjZ6p9e3PJ30KC7XpK/KKNW5qojGFwKkg20kSSyzVY9A8P2CZ qbXqzEGE0itAgasjQwCdfpMtyEbxeK3xnurDtB4rXALvKWkyP/tz685M7aCEoWlTADkA 9KOmLaVWPjr0xZC05xZ4XNIFjMILFzECcKsU9Sy7babt34dSnRWjMH6YCYedcv1KRLx1 fJAz0rvNcPoilTuC90YixwWVwRjoWV04HB8v1W6+O/ZK5JCxpspDp6tlVybgx41f+qMX vwm/N99KZJAr/qbRp6JRyIqE0uqAICL3X6WOaV4DMceaBGmfgvAKJNarJ4xoW+kr2PrS 29Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679445736; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Wb6h71xoxHJBZa+1PckiombGuAH8pAtkT2htYeArv2E=; b=Dn+uF4XaObzYNylciJ1WDcpY//ONkmptYmZDCrf69wGU02G7mcQ5Td9A4V2NfXlZri kp9aOGOTcy7zrPU72mVWGz6AniMC8Vzfgt9yT/PrBuC1yNDx0cscp/4m+slAG51PnGw+ pTkJQOboWXWXFEo0RNUTvo5s83CuQv+dDHl3zXuekKLl21axyfcItCDJmx9Is2zDTfCm 98zgP6JVlvBhQcl6n2UQNcLLh4mnpll8VJGfw1iYErx7sQaNAPPMnrSFAeblv2x5qa7x RpkjqL8IlPW9933+eyFG/5KqIS7qKQ/DJEBZVGCUFLZdReYpCHLyN4ofO++gvPaCqQoM BYJw== X-Gm-Message-State: AO0yUKUUHnX/q3MYOpR3eWIbYD86nQxeeiwYsPs8BBzhi7bwm1SuQ5qX +5hr+Iyh18r24L0+lPz4GRneaDhO1+Y= X-Google-Smtp-Source: AK7set8h9epb5Yl5tbeItPyXj8KiFVkD53RrsnyItFXXMZcfZ41XVcG3iBehROE0LSetYZv3IK1CZw== X-Received: by 2002:a05:600c:2114:b0:3ed:bbf3:6645 with SMTP id u20-20020a05600c211400b003edbbf36645mr3675280wml.10.1679445736264; Tue, 21 Mar 2023 17:42:16 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id f20-20020a7bcd14000000b003e203681b26sm14971989wmj.29.2023.03.21.17.42.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 17:42:15 -0700 (PDT) From: luca.boccassi@gmail.com 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 20.11.8 Date: Wed, 22 Mar 2023 00:41:44 +0000 Message-Id: <20230322004155.2333903-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230322004155.2333903-1-luca.boccassi@gmail.com> References: <20230315224631.1025649-39-luca.boccassi@gmail.com> <20230322004155.2333903-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.8 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/23/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/80f678d301209999ae7d7199303a19508467cc15 Thanks. Luca Boccassi --- >From 80f678d301209999ae7d7199303a19508467cc15 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 @@ -366,6 +366,7 @@ int 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; uint8_t *data_addr; @@ -482,7 +483,7 @@ 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; @@ -496,11 +497,11 @@ prepare_bufs(struct comp_test_data *test_data, struct cperf_mem_resources *mem) if (decompress_only) { 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); @@ -521,7 +522,7 @@ 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 data_sz = test_data->out_seg_sz; @@ -536,7 +537,7 @@ prepare_bufs(struct comp_test_data *test_data, struct cperf_mem_resources *mem) if (decompress_only) { rte_memcpy(data_addr, input_data_ptr, data_sz); input_data_ptr += data_sz; - remaining_data -= data_sz; + remaining_data_decomp -= data_sz; } if (rte_pktmbuf_chain(mem->comp_bufs[i], -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-21 21:56:37.388868427 +0000 +++ 0008-app-compress-perf-fix-remaining-data-for-ops.patch 2023-03-21 21:56:37.060806798 +0000 @@ -1 +1 @@ -From cf8c0c65514a12d4f326417f7cf54433338ed226 Mon Sep 17 00:00:00 2001 +From 80f678d301209999ae7d7199303a19508467cc15 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cf8c0c65514a12d4f326417f7cf54433338ed226 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org