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 9D8BAA0471 for ; Fri, 21 Jun 2019 18:52:28 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9457D1D54F; Fri, 21 Jun 2019 18:52:28 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id DC4BC1D54F for ; Fri, 21 Jun 2019 18:52:27 +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 5E0BF3086203; Fri, 21 Jun 2019 16:52:27 +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 486A860BE0; Fri, 21 Jun 2019 16:52:18 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Ferruh Yigit , dpdk stable Date: Fri, 21 Jun 2019 17:46:17 +0100 Message-Id: <20190621164626.31219-33-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.42]); Fri, 21 Jun 2019 16:52:27 +0000 (UTC) Subject: [dpdk-stable] patch 'net/kni: 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/5280da50070d80376ca93256f2d7dedda9d48085 Thanks. Kevin Traynor --- >From 5280da50070d80376ca93256f2d7dedda9d48085 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 4 Mar 2019 12:18:28 +0100 Subject: [PATCH] net/kni: fix RxQ errors stat [ upstream commit 90c354711658283c4f89822ec0f59bfadc08298b ] Transmit errors must not be reported in q_errors[] which is for reception. Fixes: 75e2bc54c018 ("net/kni: add KNI PMD") Signed-off-by: David Marchand Acked-by: Ferruh Yigit --- drivers/net/kni/rte_eth_kni.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c index 9879985ec..e45360549 100644 --- a/drivers/net/kni/rte_eth_kni.c +++ b/drivers/net/kni/rte_eth_kni.c @@ -286,8 +286,7 @@ eth_kni_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) stats->q_opackets[i] = q->tx.pkts; stats->q_obytes[i] = q->tx.bytes; - stats->q_errors[i] = q->tx.err_pkts; tx_packets_total += stats->q_opackets[i]; tx_bytes_total += stats->q_obytes[i]; - tx_packets_err_total += stats->q_errors[i]; + tx_packets_err_total += q->tx.err_pkts; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-21 17:22:13.468792784 +0100 +++ 0033-net-kni-fix-RxQ-errors-stat.patch 2019-06-21 17:22:11.744518648 +0100 @@ -1 +1 @@ -From 90c354711658283c4f89822ec0f59bfadc08298b Mon Sep 17 00:00:00 2001 +From 5280da50070d80376ca93256f2d7dedda9d48085 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 90c354711658283c4f89822ec0f59bfadc08298b ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 42a45333d..9e0c6bd2f 100644 +index 9879985ec..e45360549 100644 @@ -22 +23 @@ -@@ -291,8 +291,7 @@ eth_kni_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +@@ -286,8 +286,7 @@ eth_kni_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)