From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D8DD8A0613 for ; Wed, 28 Aug 2019 15:43:29 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CF4221BF82; Wed, 28 Aug 2019 15:43:29 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id B0CB41BF82 for ; Wed, 28 Aug 2019 15:43:28 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2E20618C893F; Wed, 28 Aug 2019 13:43:28 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0892B194B2; Wed, 28 Aug 2019 13:43:26 +0000 (UTC) From: Kevin Traynor To: Qi Zhang Cc: Stephen Hemminger , dpdk stable Date: Wed, 28 Aug 2019 14:42:08 +0100 Message-Id: <20190828134234.20547-32-ktraynor@redhat.com> In-Reply-To: <20190828134234.20547-1-ktraynor@redhat.com> References: <20190828134234.20547-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Wed, 28 Aug 2019 13:43:28 +0000 (UTC) Subject: [dpdk-stable] patch 'net/avf: fix Rx bytes stats' 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 09/04/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/ef3a5d07f666fc9f744a1ac68369043fd5197d2b Thanks. Kevin Traynor --- >From ef3a5d07f666fc9f744a1ac68369043fd5197d2b Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Wed, 17 Jul 2019 12:31:00 +0800 Subject: [PATCH] net/avf: fix Rx bytes stats [ upstream commit 15edfab79e48de2dd8be3d8793126a7692a34d61 ] Exclude 4 bytes CRC for rx bytes stats. This also aligned Rx stats calculation with PF. Fixes: f4a41a6953af ("net/avf: support stats") Signed-off-by: Qi Zhang Acked-by: Stephen Hemminger --- drivers/net/avf/avf_ethdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/avf/avf_ethdev.c index 4dc61d9fe..9739dc9bb 100644 --- a/drivers/net/avf/avf_ethdev.c +++ b/drivers/net/avf/avf_ethdev.c @@ -994,4 +994,5 @@ avf_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) stats->oerrors = pstats->tx_errors + pstats->tx_discards; stats->ibytes = pstats->rx_bytes; + stats->ibytes -= stats->ipackets * ETHER_CRC_LEN; stats->obytes = pstats->tx_bytes; } else { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:33.702736708 +0100 +++ 0033-net-avf-fix-Rx-bytes-stats.patch 2019-08-28 14:32:31.660956936 +0100 @@ -1 +1 @@ -From 15edfab79e48de2dd8be3d8793126a7692a34d61 Mon Sep 17 00:00:00 2001 +From ef3a5d07f666fc9f744a1ac68369043fd5197d2b Mon Sep 17 00:00:00 2001 @@ -4 +4,3 @@ -Subject: [PATCH] net/iavf: fix Rx bytes stats +Subject: [PATCH] net/avf: fix Rx bytes stats + +[ upstream commit 15edfab79e48de2dd8be3d8793126a7692a34d61 ] @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15 +16 @@ - drivers/net/iavf/iavf_ethdev.c | 1 + + drivers/net/avf/avf_ethdev.c | 1 + @@ -18,5 +19,5 @@ -diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c -index 48363333a..8f3907378 100644 ---- a/drivers/net/iavf/iavf_ethdev.c -+++ b/drivers/net/iavf/iavf_ethdev.c -@@ -1048,4 +1048,5 @@ iavf_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/avf/avf_ethdev.c +index 4dc61d9fe..9739dc9bb 100644 +--- a/drivers/net/avf/avf_ethdev.c ++++ b/drivers/net/avf/avf_ethdev.c +@@ -994,4 +994,5 @@ avf_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) @@ -25 +26 @@ -+ stats->ibytes -= stats->ipackets * RTE_ETHER_CRC_LEN; ++ stats->ibytes -= stats->ipackets * ETHER_CRC_LEN;