From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 1C60DA046B for ; Mon, 24 Jun 2019 17:27:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0BA281BEEB; Mon, 24 Jun 2019 17:27:00 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 61FE51BEEB for ; Mon, 24 Jun 2019 17:26:58 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D095E307ACE6; Mon, 24 Jun 2019 15:26:57 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-250.ams2.redhat.com [10.36.116.250]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9209F19C6A; Mon, 24 Jun 2019 15:26:56 +0000 (UTC) From: Kevin Traynor To: Kalesh AP Cc: Ajit Khaparde , Lance Richardson , dpdk stable Date: Mon, 24 Jun 2019 16:25:02 +0100 Message-Id: <20190624152525.19349-38-ktraynor@redhat.com> In-Reply-To: <20190624152525.19349-1-ktraynor@redhat.com> References: <20190624152525.19349-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Mon, 24 Jun 2019 15:26:57 +0000 (UTC) Subject: [dpdk-stable] patch 'net/bnxt: fix xstats' 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 06/27/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/a9aa6bf45945e28a58a570a74d250c8fc099bb4c Thanks. Kevin Traynor --- >From a9aa6bf45945e28a58a570a74d250c8fc099bb4c Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Sat, 8 Jun 2019 23:22:06 +0400 Subject: [PATCH] net/bnxt: fix xstats [ upstream commit a9586abdbcb3178b94570dd0af3646104f1154cd ] If the HWRM_PORT_QSTATS_EXT fails to initialize fw_rx_port_stats_ext_size or fw_tx_port_stats_ext_size, the driver can end up passing junk statistics to the application. Instead of relying on the application to initialize the xstats buffer before calling the xstats_get dev_op, memset xstats with zeros to avoid returning or displaying incorrect statistics. Also fixed the buffer starting offset. Fixes: f55e12f33416 ("net/bnxt: support extended port counters") Signed-off-by: Kalesh AP Signed-off-by: Ajit Khaparde Reviewed-by: Lance Richardson --- drivers/net/bnxt/bnxt_ethdev.c | 6 ++++-- drivers/net/bnxt/bnxt_stats.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 22ee725ad..224bc36ed 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -3350,5 +3350,6 @@ skip_init: bp->hw_rx_port_stats_ext = (void *) - (bp->hw_rx_port_stats + sizeof(struct rx_port_stats)); + ((uint8_t *)bp->hw_rx_port_stats + + sizeof(struct rx_port_stats)); bp->hw_rx_port_stats_ext_map = bp->hw_rx_port_stats_map + sizeof(struct rx_port_stats); @@ -3358,5 +3359,6 @@ skip_init: if (bp->hwrm_spec_code < HWRM_SPEC_CODE_1_9_2) { bp->hw_tx_port_stats_ext = (void *) - (bp->hw_tx_port_stats + sizeof(struct tx_port_stats)); + ((uint8_t *)bp->hw_tx_port_stats + + sizeof(struct tx_port_stats)); bp->hw_tx_port_stats_ext_map = bp->hw_tx_port_stats_map + diff --git a/drivers/net/bnxt/bnxt_stats.c b/drivers/net/bnxt/bnxt_stats.c index 77f855d48..73e909691 100644 --- a/drivers/net/bnxt/bnxt_stats.c +++ b/drivers/net/bnxt/bnxt_stats.c @@ -415,4 +415,6 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev, unsigned int stat_count; + memset(xstats, 0, sizeof(*xstats)); + bnxt_hwrm_port_qstats(bp); bnxt_hwrm_func_qstats_tx_drop(bp, 0xffff, &tx_drop_pkts); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-24 16:18:57.046902944 +0100 +++ 0038-net-bnxt-fix-xstats.patch 2019-06-24 16:18:55.070430303 +0100 @@ -1 +1 @@ -From a9586abdbcb3178b94570dd0af3646104f1154cd Mon Sep 17 00:00:00 2001 +From a9aa6bf45945e28a58a570a74d250c8fc099bb4c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a9586abdbcb3178b94570dd0af3646104f1154cd ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index 225487239..ee88e9a16 100644 +index 22ee725ad..224bc36ed 100644 @@ -31 +32 @@ -@@ -3776,5 +3776,6 @@ skip_init: +@@ -3350,5 +3350,6 @@ skip_init: @@ -39 +40 @@ -@@ -3784,5 +3785,6 @@ skip_init: +@@ -3358,5 +3359,6 @@ skip_init: @@ -48 +49 @@ -index ad2888774..3cd5144ec 100644 +index 77f855d48..73e909691 100644 @@ -51 +52 @@ -@@ -416,4 +416,6 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev, +@@ -415,4 +415,6 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev,