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 75BECA04B5 for ; Tue, 3 Dec 2019 19:29:10 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 467A31BFC0; Tue, 3 Dec 2019 19:29:10 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id A8CBA1BF97 for ; Tue, 3 Dec 2019 19:29:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397749; 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=EQbi1GBzLTTWI5aW2ZtdzojWWj49u+cPbCRpuykG2MM=; b=bZNx4ipMHTOsbp1fHGviJF2S4FyDGsPIkio7HmtiANSHmxTe52BJyG1lY13dNq2+e4PohM Qbqzs9DrJAZehhP9j+9Cathol5vrY+fpX/VVTWx5tEFMEJuv3evFx1k9Ay82E8OwVlWLP8 Srxftfr+5x7WC3WFFd4dUuqvgdHbteA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-221-M2c6jRw8MFmMGhLsmA0OXg-1; Tue, 03 Dec 2019 13:29:06 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id D657B800D4C; Tue, 3 Dec 2019 18:29:04 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8ADDD5C240; Tue, 3 Dec 2019 18:29:03 +0000 (UTC) From: Kevin Traynor To: Ruifeng Wang Cc: Gavin Hu , David Hunt , dpdk stable Date: Tue, 3 Dec 2019 18:27:02 +0000 Message-Id: <20191203182714.17297-53-ktraynor@redhat.com> In-Reply-To: <20191203182714.17297-1-ktraynor@redhat.com> References: <20191203182714.17297-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: M2c6jRw8MFmMGhLsmA0OXg-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'test/distributor: fix spurious failure' has been queued to LTS release 18.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/10/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 rebasi= ng (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/aebd97adab85938aaf= 026639ffd1385294c94c22 Thanks. Kevin. --- >From aebd97adab85938aaf026639ffd1385294c94c22 Mon Sep 17 00:00:00 2001 From: Ruifeng Wang Date: Tue, 15 Oct 2019 17:28:26 +0800 Subject: [PATCH] test/distributor: fix spurious failure [ upstream commit 0a82b96e36746608eee9f1f71e2258d9c0099575 ] Sanity test could spuriously fail with reporting flush count error. It was caused by worker stat coherent issue between distributor and worker thread. Fix this issue by using atomic operations to update worker stat. Fixes: c3eabff124e6 ("distributor: add unit tests") Signed-off-by: Ruifeng Wang Reviewed-by: Gavin Hu Acked-by: David Hunt --- test/test/test_distributor.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/test/test_distributor.c b/test/test/test_distributor.c index d4996798d..6aa4e49e6 100644 --- a/test/test/test_distributor.c +++ b/test/test/test_distributor.c @@ -71,10 +71,12 @@ handle_work(void *arg) =09num =3D rte_distributor_get_pkt(db, id, buf, buf, num); =09while (!quit) { -=09=09worker_stats[id].handled_packets +=3D num; +=09=09__atomic_fetch_add(&worker_stats[id].handled_packets, num, +=09=09=09=09__ATOMIC_RELAXED); =09=09count +=3D num; =09=09num =3D rte_distributor_get_pkt(db, id, =09=09=09=09buf, buf, num); =09} -=09worker_stats[id].handled_packets +=3D num; +=09__atomic_fetch_add(&worker_stats[id].handled_packets, num, +=09=09=09__ATOMIC_RELAXED); =09count +=3D num; =09rte_distributor_return_pkt(db, id, buf, num); --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:54.808326390 +0000 +++ 0053-test-distributor-fix-spurious-failure.patch=092019-12-03 17:29:51.= 776749412 +0000 @@ -1 +1 @@ -From 0a82b96e36746608eee9f1f71e2258d9c0099575 Mon Sep 17 00:00:00 2001 +From aebd97adab85938aaf026639ffd1385294c94c22 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0a82b96e36746608eee9f1f71e2258d9c0099575 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ - app/test/test_distributor.c | 6 ++++-- + test/test/test_distributor.c | 6 ++++-- @@ -21,4 +22,4 @@ -diff --git a/app/test/test_distributor.c b/app/test/test_distributor.c -index 7090b55f8..ba1f81cf8 100644 ---- a/app/test/test_distributor.c -+++ b/app/test/test_distributor.c +diff --git a/test/test/test_distributor.c b/test/test/test_distributor.c +index d4996798d..6aa4e49e6 100644 +--- a/test/test/test_distributor.c ++++ b/test/test/test_distributor.c