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 B0BA6A0471 for ; Fri, 21 Jun 2019 18:52:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A96CF1D54F; Fri, 21 Jun 2019 18:52:36 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 9A31F1D54F for ; Fri, 21 Jun 2019 18:52:35 +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 1C86EC0624A1; Fri, 21 Jun 2019 16:52:35 +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 CBC9760BE0; Fri, 21 Jun 2019 16:52:29 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Shahaf Shuler , dpdk stable Date: Fri, 21 Jun 2019 17:46:18 +0100 Message-Id: <20190621164626.31219-34-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.32]); Fri, 21 Jun 2019 16:52:35 +0000 (UTC) Subject: [dpdk-stable] patch 'net/mlx4: 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/5a8e4e2c8da1fa7d6e3e965a817dc373b46b5cb3 Thanks. Kevin Traynor --- >From 5a8e4e2c8da1fa7d6e3e965a817dc373b46b5cb3 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 4 Mar 2019 12:18:29 +0100 Subject: [PATCH] net/mlx4: fix RxQ errors stat [ upstream commit 6a1bc531ac6b8fcd101ea42d4a419f92655f7087 ] Transmit errors must not be reported in q_errors[] which is for reception. Fixes: 7fae69eeff13 ("mlx4: new poll mode driver") Signed-off-by: David Marchand Acked-by: Shahaf Shuler --- drivers/net/mlx4/mlx4_ethdev.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/mlx4/mlx4_ethdev.c b/drivers/net/mlx4/mlx4_ethdev.c index 084b24e49..a9f8910cf 100644 --- a/drivers/net/mlx4/mlx4_ethdev.c +++ b/drivers/net/mlx4/mlx4_ethdev.c @@ -636,5 +636,4 @@ mlx4_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) tmp.q_opackets[idx] += txq->stats.opackets; tmp.q_obytes[idx] += txq->stats.obytes; - tmp.q_errors[idx] += txq->stats.odropped; } tmp.opackets += txq->stats.opackets; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-21 17:22:13.517488258 +0100 +++ 0034-net-mlx4-fix-RxQ-errors-stat.patch 2019-06-21 17:22:11.745518625 +0100 @@ -1 +1 @@ -From 6a1bc531ac6b8fcd101ea42d4a419f92655f7087 Mon Sep 17 00:00:00 2001 +From 5a8e4e2c8da1fa7d6e3e965a817dc373b46b5cb3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6a1bc531ac6b8fcd101ea42d4a419f92655f7087 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 3d18aa4fc..ceef92162 100644 +index 084b24e49..a9f8910cf 100644 @@ -22 +23 @@ -@@ -719,5 +719,4 @@ mlx4_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +@@ -636,5 +636,4 @@ mlx4_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)