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 7FD9DA04B5 for ; Tue, 3 Dec 2019 19:28:42 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7650F1BF8D; Tue, 3 Dec 2019 19:28:42 +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 20BF6235 for ; Tue, 3 Dec 2019 19:28:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397720; 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=rMsJMt0Ngq3qxF7mcYMzZIJi/mjBBzClOvqZGgo8w+E=; b=N3bvLV8y8uG/PQWI4IZ4VZ32bKSEGr+VtIfemi4MLSTMQT81Y1YWm92g143vR2/S/FeMMO eTlfROWPPw8QQHcXdIWfZbILVKJVz1ORC3URGSTwQIPtJy8bmYj2lbop34LESe5HAMdBzf ZJClELYaYisHnoa4xfP31VvGfB8cOO4= 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-317-Lhvp990VPkC7VAahCiJgWw-1; Tue, 03 Dec 2019 13:28:37 -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 3B90510054E3; Tue, 3 Dec 2019 18:28:36 +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 312CA5C554; Tue, 3 Dec 2019 18:28:34 +0000 (UTC) From: Kevin Traynor To: Gage Eads Cc: Harry van Haaren , dpdk stable Date: Tue, 3 Dec 2019 18:26:44 +0000 Message-Id: <20191203182714.17297-35-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: Lhvp990VPkC7VAahCiJgWw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'event/sw: fix xstats reset value' 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/8d9963a6ff32f8bca6= f87ecb2b82655b96b7c0ce Thanks. Kevin. --- >From 8d9963a6ff32f8bca6f87ecb2b82655b96b7c0ce Mon Sep 17 00:00:00 2001 From: Gage Eads Date: Tue, 27 Aug 2019 16:34:59 -0500 Subject: [PATCH] event/sw: fix xstats reset value [ upstream commit d02c470c87976def34bae0307736ecb9c8cac9d8 ] The sw PMD implements xstats reset by having the xstat get operations return a value to the statistic's value at the last reset. The value at the last reset is maintained in the per-xstat reset_value field, but the PMD was setting reset_value =3D current - reset_value instead of reset_value = =3D current. Fixes: c1ad03df7ad5 ("event/sw: support xstats") Signed-off-by: Gage Eads Acked-by: Harry van Haaren --- drivers/event/sw/sw_evdev_xstats.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/event/sw/sw_evdev_xstats.c b/drivers/event/sw/sw_evdev= _xstats.c index 7a6caa64d..90664903b 100644 --- a/drivers/event/sw/sw_evdev_xstats.c +++ b/drivers/event/sw/sw_evdev_xstats.c @@ -492,5 +492,5 @@ sw_xstats_update(struct sw_evdev *sw, enum rte_event_de= v_xstats_mode mode, =20 =09=09if (xs->reset_allowed && reset) -=09=09=09xs->reset_value =3D val; +=09=09=09xs->reset_value +=3D val; =20 =09=09xidx++; @@ -545,6 +545,5 @@ sw_xstats_reset_range(struct sw_evdev *sw, uint32_t sta= rt, uint32_t num) =09=09=09continue; =20 -=09=09uint64_t val =3D xs->fn(sw, xs->obj_idx, xs->stat, xs->extra_arg) -=09=09=09=09=09- xs->reset_value; +=09=09uint64_t val =3D xs->fn(sw, xs->obj_idx, xs->stat, xs->extra_arg); =09=09xs->reset_value =3D val; =09} --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:53.858161828 +0000 +++ 0035-event-sw-fix-xstats-reset-value.patch=092019-12-03 17:29:51.760749= 745 +0000 @@ -1 +1 @@ -From d02c470c87976def34bae0307736ecb9c8cac9d8 Mon Sep 17 00:00:00 2001 +From 8d9963a6ff32f8bca6f87ecb2b82655b96b7c0ce Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d02c470c87976def34bae0307736ecb9c8cac9d8 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org