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 3B0EBA0471 for ; Fri, 21 Jun 2019 18:52:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 32B8B1D54F; Fri, 21 Jun 2019 18:52:03 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 996E61D572 for ; Fri, 21 Jun 2019 18:52:01 +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 17EBE300413F; Fri, 21 Jun 2019 16:52:01 +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 AFA3E60BFB; Fri, 21 Jun 2019 16:51:54 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Ferruh Yigit , dpdk stable Date: Fri, 21 Jun 2019 17:46:13 +0100 Message-Id: <20190621164626.31219-29-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.46]); Fri, 21 Jun 2019 16:52:01 +0000 (UTC) Subject: [dpdk-stable] patch 'net/af_packet: 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/319a848e116c0564b8f1c543b4890fd5d3fcda2a Thanks. Kevin Traynor --- >From 319a848e116c0564b8f1c543b4890fd5d3fcda2a Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 4 Mar 2019 12:18:24 +0100 Subject: [PATCH] net/af_packet: fix RxQ errors stat [ upstream commit 3b79ed8a39555aca070671593ae97b753638a19c ] Transmit errors must not be reported in q_errors[] which is for reception. Fixes: 364e08f2bbc0 ("af_packet: add PMD for AF_PACKET-based virtual devices") Signed-off-by: David Marchand Reviewed-by: Ferruh Yigit --- drivers/net/af_packet/rte_eth_af_packet.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index 264cfc08f..ec90cc06c 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -329,8 +329,7 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats) for (i = 0; i < imax; i++) { igb_stats->q_opackets[i] = internal->tx_queue[i].tx_pkts; - igb_stats->q_errors[i] = internal->tx_queue[i].err_pkts; igb_stats->q_obytes[i] = internal->tx_queue[i].tx_bytes; tx_total += igb_stats->q_opackets[i]; - tx_err_total += igb_stats->q_errors[i]; + tx_err_total += internal->tx_queue[i].err_pkts; tx_bytes_total += igb_stats->q_obytes[i]; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-21 17:22:13.245411413 +0100 +++ 0029-net-af_packet-fix-RxQ-errors-stat.patch 2019-06-21 17:22:11.737518807 +0100 @@ -1 +1 @@ -From 3b79ed8a39555aca070671593ae97b753638a19c Mon Sep 17 00:00:00 2001 +From 319a848e116c0564b8f1c543b4890fd5d3fcda2a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3b79ed8a39555aca070671593ae97b753638a19c ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index b5c4befce..4a660d5f0 100644 +index 264cfc08f..ec90cc06c 100644 @@ -22 +23 @@ -@@ -330,8 +330,7 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats) +@@ -329,8 +329,7 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats)