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 3EDD8A0542 for ; Fri, 7 Feb 2020 16:14:00 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 383011C124; Fri, 7 Feb 2020 16:14:00 +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 0AB211C12B for ; Fri, 7 Feb 2020 16:13:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581088437; 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=Vb6ML7gU9zqGvHj8teY5F96et/WsksadaC7TIP1HGsY=; b=XQOIA63g4hIdN/Rt5LsLWoQ18+FFLTzn+cNWrV2S2hTqFMBA3BDl7GKrJYEaYOuJfW4P9q 5ADeeTEp6q81cK7J/k70/I/3IeuL3O1WnP/OCui/qsI7cna9mVbnVtUpTbI2bGlFG7oowJ 3v6k0yQE8Zbn+10kDRSfFMp4fE6o/tU= 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-gSwecgExOMKqYTMBohzXig-1; Fri, 07 Feb 2020 10:13:36 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4734D95BA7; Fri, 7 Feb 2020 15:13:35 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 551FC10016DA; Fri, 7 Feb 2020 15:13:34 +0000 (UTC) From: Kevin Traynor To: Jiaqi Min Cc: Jingjing Wu , dpdk stable Date: Fri, 7 Feb 2020 15:12:27 +0000 Message-Id: <20200207151248.29804-15-ktraynor@redhat.com> In-Reply-To: <20200207151248.29804-1-ktraynor@redhat.com> References: <20200207151248.29804-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: gSwecgExOMKqYTMBohzXig-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/iavf: fix Rx total stats' has been queued to LTS release 18.11.7 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.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/13/20. 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/bd421261d446f11a29= 0da3b2fb9ea18939312d93 Thanks. Kevin. --- >From bd421261d446f11a290da3b2fb9ea18939312d93 Mon Sep 17 00:00:00 2001 From: Jiaqi Min Date: Fri, 13 Dec 2019 01:23:29 +0000 Subject: [PATCH] net/iavf: fix Rx total stats [ upstream commit e71ffcc1008eeb67d585174dfb10066e9e3df2f7 ] Rx total stats is the total number of successfully received packets, so exclude the number of rx_discards for Rx total stats. Fixes: f4a41a6953af ("net/avf: support stats") Signed-off-by: Jiaqi Min Acked-by: Jingjing Wu --- drivers/net/avf/avf_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/avf/avf_ethdev.c index 9739dc9bb6..e67621e4a9 100644 --- a/drivers/net/avf/avf_ethdev.c +++ b/drivers/net/avf/avf_ethdev.c @@ -988,5 +988,5 @@ avf_dev_stats_get(struct rte_eth_dev *dev, struct rte_e= th_stats *stats) =09if (ret =3D=3D 0) { =09=09stats->ipackets =3D pstats->rx_unicast + pstats->rx_multicast + -=09=09=09=09=09=09pstats->rx_broadcast; +=09=09=09=09pstats->rx_broadcast - pstats->rx_discards; =09=09stats->opackets =3D pstats->tx_broadcast + pstats->tx_multicast + =09=09=09=09=09=09pstats->tx_unicast; --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-07 15:08:18.304263338 +0000 +++ 0015-net-iavf-fix-Rx-total-stats.patch=092020-02-07 15:08:17.504063082 = +0000 @@ -1 +1 @@ -From e71ffcc1008eeb67d585174dfb10066e9e3df2f7 Mon Sep 17 00:00:00 2001 +From bd421261d446f11a290da3b2fb9ea18939312d93 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e71ffcc1008eeb67d585174dfb10066e9e3df2f7 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15 +16 @@ - drivers/net/iavf/iavf_ethdev.c | 2 +- + drivers/net/avf/avf_ethdev.c | 2 +- @@ -18,6 +19,6 @@ -diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev= .c -index a39ba1466c..f544303c05 100644 ---- a/drivers/net/iavf/iavf_ethdev.c -+++ b/drivers/net/iavf/iavf_ethdev.c -@@ -1069,5 +1069,5 @@ iavf_dev_stats_get(struct rte_eth_dev *dev, struct r= te_eth_stats *stats) - =09=09iavf_update_stats(vsi, pstats); +diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/avf/avf_ethdev.c +index 9739dc9bb6..e67621e4a9 100644 +--- a/drivers/net/avf/avf_ethdev.c ++++ b/drivers/net/avf/avf_ethdev.c +@@ -988,5 +988,5 @@ avf_dev_stats_get(struct rte_eth_dev *dev, struct rte_= eth_stats *stats) + =09if (ret =3D=3D 0) {