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 3D50FA0524 for ; Fri, 5 Feb 2021 12:36:18 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3718B4067B; Fri, 5 Feb 2021 12:36:18 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 3DA29188A30 for ; Fri, 5 Feb 2021 12:36:16 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id m1so5656903wml.2 for ; Fri, 05 Feb 2021 03:36:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pxz97UlnWeJZUtl5qKV8dOLDMei8fRVxuD0UkHNRzS8=; b=dSwvvva23dUlJdBQUT+TXjg6d65MnoGCwDO18veEQVM6zhUJ4ZaNIGbuBOS0ikvQFq VLOhpKOkKVpgB0uB4BLM5UrvZD09dUThbVUkr6/DiJv3sC+uVur0MSItyH3lU3KweV0N T1zNRrnGAV+Jz+kSWdiHOAufOXXqJwT8ldQjWB4DBFupbLZ1Ao7ED5OXjI+xhWxeXZlM JreKpeWsqSwkMiia8CyZryv1vaczfIh6NZTKLQZgc4navFuqpwfvwhUOU/ps1y3ZBrTM CrnZyk7Ngx5bN4Lzk/1IqwG68whJ7894lsWjAZeKfHc+/97GFV/puyLwxJDOwZcF1Eac 9DAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pxz97UlnWeJZUtl5qKV8dOLDMei8fRVxuD0UkHNRzS8=; b=G/4pM9LgEPhyUWa2tiCTVagH3dokmpUin2nWUDYpaSEsTuNJept7GRXtLy+5XoHyBj f/ogGcrbicT0JEEmeZfmAOV40e0hYZSa13K0tdGVXh189KXvlgzeVGknly6AMAWsDf5B saMPgpccB+yzeaj/ZRSlEmZBT3EupMbE6jGh5mP9+fwNWqoNB4NvtfZfRm1A31A3NOwl x+MbdiLZidAzRkOqqx0Tlr5kUMYYfrFKvPn+ZQ1n6nzA1RPR+lFK5pA3PZi7veevtenC JATWMzKyhMIAViybda61O+frWwLCJQZ0dBNQvqrcL8p0RZRlJq9xKdEzGRSR8kOQhKwt U7Cw== X-Gm-Message-State: AOAM532ApStngxvMEhPD2ospPzddyiXs2V7wN1WH+t33HCf+ApkBLmh/ EYILR77qOOkiQZPc8QqaScc= X-Google-Smtp-Source: ABdhPJykFkUkM45CXugLP4zA/+TTdjIcEqhHdhNf1W8Ia8X3xrV3WjE6VWKa+YYUC3fJ+E/oOT/1gQ== X-Received: by 2002:a1c:e309:: with SMTP id a9mr3196785wmh.99.1612524975978; Fri, 05 Feb 2021 03:36:15 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z4sm11612432wrw.38.2021.02.05.03.36.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:36:15 -0800 (PST) From: luca.boccassi@gmail.com To: Feifei Wang Cc: Ruifeng Wang , Jerin Jacob , dpdk stable Date: Fri, 5 Feb 2021 11:18:13 +0000 Message-Id: <20210205111920.1272063-207-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.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 20.11.1 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 20.11.1 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/07/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/12703004dd846f323da7f7e375e02dc16f5aa00a Thanks. Luca Boccassi --- >From 12703004dd846f323da7f7e375e02dc16f5aa00a 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.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:38.385746487 +0000 +++ 0207-app-eventdev-adjust-event-count-order-for-pipeline-t.patch 2021-02-05 11:18:29.166697965 +0000 @@ -1 +1 @@ -From e0c0573783455288dbe2fd70c24acd1cd66d6cb6 Mon Sep 17 00:00:00 2001 +From 12703004dd846f323da7f7e375e02dc16f5aa00a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e0c0573783455288dbe2fd70c24acd1cd66d6cb6 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org