From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 06C34A0613 for ; Tue, 27 Aug 2019 11:31:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F1A8A54AE; Tue, 27 Aug 2019 11:31:54 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 9049B1BFF1 for ; Tue, 27 Aug 2019 11:31:53 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 03DE618B3D86; Tue, 27 Aug 2019 09:31:53 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id E97435C1B2; Tue, 27 Aug 2019 09:31:51 +0000 (UTC) From: Kevin Traynor To: Harman Kalra Cc: David Hunt , dpdk stable Date: Tue, 27 Aug 2019 10:30:25 +0100 Message-Id: <20190827093032.20423-48-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Tue, 27 Aug 2019 09:31:53 +0000 (UTC) Subject: [dpdk-stable] patch 'test/distributor: fix flush with worker shutdown' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/03/19. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/8ba090cf6723a1552ba52b92718bc7a11f52b746 Thanks. Kevin Traynor --- >From 8ba090cf6723a1552ba52b92718bc7a11f52b746 Mon Sep 17 00:00:00 2001 From: Harman Kalra Date: Fri, 5 Jul 2019 10:05:04 +0000 Subject: [PATCH] test/distributor: fix flush with worker shutdown [ upstream commit c275ded129cc553309c544b0574826ab23eb2153 ] On restarting worker 0 after shutdown, packets handled by worker 0 must be incremented only when a packet is received by it. Fixes: c3eabff124e6 ("distributor: add unit tests") Signed-off-by: Harman Kalra Acked-by: David Hunt --- test/test/test_distributor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test/test_distributor.c b/test/test/test_distributor.c index da3348fd1..d4996798d 100644 --- a/test/test/test_distributor.c +++ b/test/test/test_distributor.c @@ -375,5 +375,6 @@ handle_work_for_shutdown_test(void *arg) while (!quit) { - worker_stats[id].handled_packets++, count++; + worker_stats[id].handled_packets += num; + count += num; rte_pktmbuf_free(pkt); num = rte_distributor_get_pkt(d, id, buf, buf, num); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-27 09:40:13.530590519 +0100 +++ 0048-test-distributor-fix-flush-with-worker-shutdown.patch 2019-08-27 09:40:10.949143684 +0100 @@ -1 +1 @@ -From c275ded129cc553309c544b0574826ab23eb2153 Mon Sep 17 00:00:00 2001 +From 8ba090cf6723a1552ba52b92718bc7a11f52b746 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c275ded129cc553309c544b0574826ab23eb2153 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - app/test/test_distributor.c | 3 ++- + test/test/test_distributor.c | 3 ++- @@ -19,5 +20,5 @@ -diff --git a/app/test/test_distributor.c b/app/test/test_distributor.c -index 928238f4c..7090b55f8 100644 ---- a/app/test/test_distributor.c -+++ b/app/test/test_distributor.c -@@ -376,5 +376,6 @@ handle_work_for_shutdown_test(void *arg) +diff --git a/test/test/test_distributor.c b/test/test/test_distributor.c +index da3348fd1..d4996798d 100644 +--- a/test/test/test_distributor.c ++++ b/test/test/test_distributor.c +@@ -375,5 +375,6 @@ handle_work_for_shutdown_test(void *arg)