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 84B4DA0471 for ; Fri, 21 Jun 2019 18:52:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7D5351D54F; Fri, 21 Jun 2019 18:52:20 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 674381D54F for ; Fri, 21 Jun 2019 18:52:18 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DD9115D688; Fri, 21 Jun 2019 16:52:17 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-77.ams2.redhat.com [10.36.117.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id 780A560BE0; Fri, 21 Jun 2019 16:52:12 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Ferruh Yigit , dpdk stable Date: Fri, 21 Jun 2019 17:46:16 +0100 Message-Id: <20190621164626.31219-32-ktraynor@redhat.com> In-Reply-To: <20190621164626.31219-1-ktraynor@redhat.com> References: <20190621164626.31219-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 21 Jun 2019 16:52:17 +0000 (UTC) Subject: [dpdk-stable] patch 'net/cxgbe: fix RxQ errors stat' 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/26/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/e25c8cee1a3b65ada67ea1300af42f31f9c08a05 Thanks. Kevin Traynor --- >From e25c8cee1a3b65ada67ea1300af42f31f9c08a05 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 4 Mar 2019 12:18:27 +0100 Subject: [PATCH] net/cxgbe: fix RxQ errors stat [ upstream commit 01b5e419dee35b9c15e38ca24ea6f9a2385ee8ed ] Transmit errors must not be reported in q_errors[] which is for reception. Fixes: 856505d303f4 ("cxgbe: add port statistics") Fixes: a0a344a8f728 ("net/cxgbe: add VF port statistics") Signed-off-by: David Marchand Reviewed-by: Ferruh Yigit --- drivers/net/cxgbe/cxgbe_ethdev.c | 1 - drivers/net/cxgbe/cxgbevf_ethdev.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c index 7babdfb49..308537880 100644 --- a/drivers/net/cxgbe/cxgbe_ethdev.c +++ b/drivers/net/cxgbe/cxgbe_ethdev.c @@ -707,5 +707,4 @@ static int cxgbe_dev_stats_get(struct rte_eth_dev *eth_dev, eth_stats->q_opackets[i] = txq->stats.pkts; eth_stats->q_obytes[i] = txq->stats.tx_bytes; - eth_stats->q_errors[i] = txq->stats.mapping_err; } return 0; diff --git a/drivers/net/cxgbe/cxgbevf_ethdev.c b/drivers/net/cxgbe/cxgbevf_ethdev.c index a6458d533..cc65ebe65 100644 --- a/drivers/net/cxgbe/cxgbevf_ethdev.c +++ b/drivers/net/cxgbe/cxgbevf_ethdev.c @@ -70,5 +70,4 @@ static int cxgbevf_dev_stats_get(struct rte_eth_dev *eth_dev, eth_stats->q_opackets[i] = txq->stats.pkts; eth_stats->q_obytes[i] = txq->stats.tx_bytes; - eth_stats->q_errors[i] = txq->stats.mapping_err; } return 0; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-21 17:22:13.415665420 +0100 +++ 0032-net-cxgbe-fix-RxQ-errors-stat.patch 2019-06-21 17:22:11.744518648 +0100 @@ -1 +1 @@ -From 01b5e419dee35b9c15e38ca24ea6f9a2385ee8ed Mon Sep 17 00:00:00 2001 +From e25c8cee1a3b65ada67ea1300af42f31f9c08a05 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 01b5e419dee35b9c15e38ca24ea6f9a2385ee8ed ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index c03559640..67b08490b 100644 +index 7babdfb49..308537880 100644 @@ -31 +32 @@ -index 0e93d99e6..0af9dd9f1 100644 +index a6458d533..cc65ebe65 100644