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 0CF39A0471 for ; Fri, 21 Jun 2019 18:52:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F2C3B1D54F; Fri, 21 Jun 2019 18:52:55 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 8EAC61D54F for ; Fri, 21 Jun 2019 18:52:54 +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 10B5E30F1BD1; Fri, 21 Jun 2019 16:52:54 +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 95F1A60BE0; Fri, 21 Jun 2019 16:52:49 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Ferruh Yigit , dpdk stable Date: Fri, 21 Jun 2019 17:46:22 +0100 Message-Id: <20190621164626.31219-38-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.43]); Fri, 21 Jun 2019 16:52:54 +0000 (UTC) Subject: [dpdk-stable] patch 'net/ring: 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/0b24c7b21ce35cdfd9f9a548ce085e254d3d9474 Thanks. Kevin Traynor --- >From 0b24c7b21ce35cdfd9f9a548ce085e254d3d9474 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 4 Mar 2019 12:18:33 +0100 Subject: [PATCH] net/ring: fix RxQ errors stat [ upstream commit c1f9d6c698453fc59b37900ebe4deeae1e98233f ] Transmit errors must not be reported in q_errors[] which is for reception. Fixes: e1e4017751f1 ("ring: add new driver") Signed-off-by: David Marchand Reviewed-by: Ferruh Yigit --- drivers/net/ring/rte_eth_ring.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c index c438da51c..6458831c9 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c @@ -185,7 +185,6 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) i < dev->data->nb_tx_queues; i++) { stats->q_opackets[i] = internal->tx_ring_queues[i].tx_pkts.cnt; - stats->q_errors[i] = internal->tx_ring_queues[i].err_pkts.cnt; tx_total += stats->q_opackets[i]; - tx_err_total += stats->q_errors[i]; + tx_err_total += internal->tx_ring_queues[i].err_pkts.cnt; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-21 17:22:13.717976802 +0100 +++ 0038-net-ring-fix-RxQ-errors-stat.patch 2019-06-21 17:22:11.748518557 +0100 @@ -1 +1 @@ -From c1f9d6c698453fc59b37900ebe4deeae1e98233f Mon Sep 17 00:00:00 2001 +From 0b24c7b21ce35cdfd9f9a548ce085e254d3d9474 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c1f9d6c698453fc59b37900ebe4deeae1e98233f ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index cae63a7f1..65c2813ba 100644 +index c438da51c..6458831c9 100644