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 6AEAAA0524 for ; Thu, 4 Feb 2021 12:37:03 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 65269240754; Thu, 4 Feb 2021 12:37:03 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id D73F324078F for ; Thu, 4 Feb 2021 12:37:01 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cwV-0005XL-Sk; Thu, 04 Feb 2021 11:36:59 +0000 From: Christian Ehrhardt To: Feifei Wang Cc: Ruifeng Wang , Jerin Jacob , dpdk stable Date: Thu, 4 Feb 2021 12:29:04 +0100 Message-Id: <20210204112954.2488123-89-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/eventdev: adjust event count order for pipeline test' has been queued to stable release 19.11.7 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/06/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/f6b965da1d1e45f69848e15e31513471ef96b3e9 Thanks. Christian Ehrhardt --- >From f6b965da1d1e45f69848e15e31513471ef96b3e9 Mon Sep 17 00:00:00 2001 From: Feifei Wang Date: Fri, 22 Jan 2021 13:19:15 +0800 Subject: [PATCH] app/eventdev: adjust event count order for pipeline test [ upstream commit e0c0573783455288dbe2fd70c24acd1cd66d6cb6 ] For the fwd mode (internal_port = false) in pipeline test, processed-pkts increment should after enqueue. However, in multi_stage_fwd and multi_stage_burst_fwd, "w->processed_pkts" is increased before enqueue. To fix this, move "w->processed_pkts" increment after enqueue, and then the main core can load the correct number of processed packets. Fixes: 314bcf58ca8f ("app/eventdev: add pipeline queue worker functions") Signed-off-by: Feifei Wang Reviewed-by: Ruifeng Wang Acked-by: Jerin Jacob --- app/test-eventdev/test_pipeline_queue.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/test-eventdev/test_pipeline_queue.c b/app/test-eventdev/test_pipeline_queue.c index 7bebac34fc..01f33e3b44 100644 --- a/app/test-eventdev/test_pipeline_queue.c +++ b/app/test-eventdev/test_pipeline_queue.c @@ -180,13 +180,13 @@ pipeline_queue_worker_multi_stage_fwd(void *arg) ev.queue_id = tx_queue[ev.mbuf->port]; rte_event_eth_tx_adapter_txq_set(ev.mbuf, 0); pipeline_fwd_event(&ev, RTE_SCHED_TYPE_ATOMIC); + pipeline_event_enqueue(dev, port, &ev); w->processed_pkts++; } else { ev.queue_id++; pipeline_fwd_event(&ev, sched_type_list[cq_id]); + pipeline_event_enqueue(dev, port, &ev); } - - pipeline_event_enqueue(dev, port, &ev); } return 0; @@ -237,6 +237,7 @@ pipeline_queue_worker_multi_stage_burst_fwd(void *arg) const uint8_t *tx_queue = t->tx_evqueue_id; while (t->done == false) { + uint16_t processed_pkts = 0; uint16_t nb_rx = rte_event_dequeue_burst(dev, port, ev, BURST_SIZE, 0); @@ -254,7 +255,7 @@ pipeline_queue_worker_multi_stage_burst_fwd(void *arg) rte_event_eth_tx_adapter_txq_set(ev[i].mbuf, 0); pipeline_fwd_event(&ev[i], RTE_SCHED_TYPE_ATOMIC); - w->processed_pkts++; + processed_pkts++; } else { ev[i].queue_id++; pipeline_fwd_event(&ev[i], @@ -263,6 +264,7 @@ pipeline_queue_worker_multi_stage_burst_fwd(void *arg) } pipeline_event_enqueue_burst(dev, port, ev, nb_rx); + w->processed_pkts += processed_pkts; } return 0; -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:31.722692828 +0100 +++ 0089-app-eventdev-adjust-event-count-order-for-pipeline-t.patch 2021-02-04 12:04:28.094789791 +0100 @@ -1 +1 @@ -From e0c0573783455288dbe2fd70c24acd1cd66d6cb6 Mon Sep 17 00:00:00 2001 +From f6b965da1d1e45f69848e15e31513471ef96b3e9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e0c0573783455288dbe2fd70c24acd1cd66d6cb6 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org