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 833ACA046B for ; Fri, 23 Aug 2019 11:44:49 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 769041BF4C; Fri, 23 Aug 2019 11:44:49 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id AB9741BF9B for ; Fri, 23 Aug 2019 11:44:47 +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 0DF543175288; Fri, 23 Aug 2019 09:44:47 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 03DFE5C226; Fri, 23 Aug 2019 09:44:45 +0000 (UTC) From: Kevin Traynor To: Mohsin Mazhar Shaikh Cc: Stephen Hemminger , dpdk stable Date: Fri, 23 Aug 2019 10:43:12 +0100 Message-Id: <20190823094336.12078-22-ktraynor@redhat.com> In-Reply-To: <20190823094336.12078-1-ktraynor@redhat.com> References: <20190823094336.12078-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.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 23 Aug 2019 09:44:47 +0000 (UTC) Subject: [dpdk-stable] patch 'net/netvsc: fix xstats id' 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 08/28/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/9fd8123bdaefd63d9158fa91bd13820a8b7fb397 Thanks. Kevin Traynor --- >From 9fd8123bdaefd63d9158fa91bd13820a8b7fb397 Mon Sep 17 00:00:00 2001 From: Mohsin Mazhar Shaikh Date: Thu, 20 Jun 2019 15:09:23 -0700 Subject: [PATCH] net/netvsc: fix xstats id [ upstream commit b21ad01a82904413485c82a08c154aeacf31fd02 ] The xstats_get was not setting id correctly for each entry. Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device") Signed-off-by: Mohsin Mazhar Shaikh Signed-off-by: Stephen Hemminger --- drivers/net/netvsc/hn_ethdev.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c index c3afd2fe9..cf03972fd 100644 --- a/drivers/net/netvsc/hn_ethdev.c +++ b/drivers/net/netvsc/hn_ethdev.c @@ -573,7 +573,9 @@ hn_dev_xstats_get(struct rte_eth_dev *dev, stats = (const char *)&txq->stats; - for (t = 0; t < RTE_DIM(hn_stat_strings); t++) - xstats[count++].value = *(const uint64_t *) + for (t = 0; t < RTE_DIM(hn_stat_strings); t++, count++) { + xstats[count].id = count; + xstats[count].value = *(const uint64_t *) (stats + hn_stat_strings[t].offset); + } } @@ -585,7 +587,9 @@ hn_dev_xstats_get(struct rte_eth_dev *dev, stats = (const char *)&rxq->stats; - for (t = 0; t < RTE_DIM(hn_stat_strings); t++) - xstats[count++].value = *(const uint64_t *) + for (t = 0; t < RTE_DIM(hn_stat_strings); t++, count++) { + xstats[count].id = count; + xstats[count].value = *(const uint64_t *) (stats + hn_stat_strings[t].offset); + } } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-22 19:38:21.903047589 +0100 +++ 0022-net-netvsc-fix-xstats-id.patch 2019-08-22 19:38:20.442026760 +0100 @@ -1 +1 @@ -From b21ad01a82904413485c82a08c154aeacf31fd02 Mon Sep 17 00:00:00 2001 +From 9fd8123bdaefd63d9158fa91bd13820a8b7fb397 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b21ad01a82904413485c82a08c154aeacf31fd02 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index e0b701676..69cf5d1d9 100644 +index c3afd2fe9..cf03972fd 100644 @@ -21 +22 @@ -@@ -743,7 +743,9 @@ hn_dev_xstats_get(struct rte_eth_dev *dev, +@@ -573,7 +573,9 @@ hn_dev_xstats_get(struct rte_eth_dev *dev, @@ -33 +34 @@ -@@ -755,7 +757,9 @@ hn_dev_xstats_get(struct rte_eth_dev *dev, +@@ -585,7 +587,9 @@ hn_dev_xstats_get(struct rte_eth_dev *dev,