From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id BF3C11B505 for ; Fri, 30 Nov 2018 00:13:15 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:19:04 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id wATNCW7M032075; Fri, 30 Nov 2018 01:13:09 +0200 From: Yongseok Koh To: Andy Moreton Cc: Andrew Rybchenko , dpdk stable Date: Thu, 29 Nov 2018 15:10:16 -0800 Message-Id: <20181129231202.30436-22-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'net/sfc/base: fix MAC Tx stats for less or equal to 64 bytes' has been queued to LTS release 17.11.5 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: , X-List-Received-Date: Thu, 29 Nov 2018 23:13:16 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/01/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Yongseok --- >>From 72bf1e7f4213c2eb3a180107dd0eba793a5697f4 Mon Sep 17 00:00:00 2001 From: Andy Moreton Date: Mon, 10 Sep 2018 10:33:35 +0100 Subject: [PATCH] net/sfc/base: fix MAC Tx stats for less or equal to 64 bytes [ upstream commit 42f235911a613b339b3b6597fd0b998321c2ce22 ] This statistic should include 64byte and smaller frames. Fix EF10 calculation to match Siena code. Fixes: 8c7c723dfe7c ("net/sfc/base: import MAC statistics") Signed-off-by: Andy Moreton Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/base/ef10_mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/sfc/base/ef10_mac.c b/drivers/net/sfc/base/ef10_mac.c index 488633f56..b7dd12d6c 100644 --- a/drivers/net/sfc/base/ef10_mac.c +++ b/drivers/net/sfc/base/ef10_mac.c @@ -612,7 +612,7 @@ ef10_mac_stats_update( EF10_MAC_STAT_READ(esmp, MC_CMD_MAC_TX_LT64_PKTS, &value); EFSYS_STAT_SET_QWORD(&(stat[EFX_MAC_TX_LE_64_PKTS]), &value); EF10_MAC_STAT_READ(esmp, MC_CMD_MAC_TX_64_PKTS, &value); - EFSYS_STAT_SET_QWORD(&(stat[EFX_MAC_TX_LE_64_PKTS]), &value); + EFSYS_STAT_INCR_QWORD(&(stat[EFX_MAC_TX_LE_64_PKTS]), &value); EF10_MAC_STAT_READ(esmp, MC_CMD_MAC_TX_65_TO_127_PKTS, &value); EFSYS_STAT_SET_QWORD(&(stat[EFX_MAC_TX_65_TO_127_PKTS]), &value); -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:46.249994173 -0800 +++ 0022-net-sfc-base-fix-MAC-Tx-stats-for-less-or-equal-to-6.patch 2018-11-29 15:01:45.016960000 -0800 @@ -1,13 +1,14 @@ -From 42f235911a613b339b3b6597fd0b998321c2ce22 Mon Sep 17 00:00:00 2001 +From 72bf1e7f4213c2eb3a180107dd0eba793a5697f4 Mon Sep 17 00:00:00 2001 From: Andy Moreton Date: Mon, 10 Sep 2018 10:33:35 +0100 Subject: [PATCH] net/sfc/base: fix MAC Tx stats for less or equal to 64 bytes +[ upstream commit 42f235911a613b339b3b6597fd0b998321c2ce22 ] + This statistic should include 64byte and smaller frames. Fix EF10 calculation to match Siena code. Fixes: 8c7c723dfe7c ("net/sfc/base: import MAC statistics") -Cc: stable@dpdk.org Signed-off-by: Andy Moreton Signed-off-by: Andrew Rybchenko @@ -16,10 +17,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/sfc/base/ef10_mac.c b/drivers/net/sfc/base/ef10_mac.c -index a4a6d9ec8..ab73828f1 100644 +index 488633f56..b7dd12d6c 100644 --- a/drivers/net/sfc/base/ef10_mac.c +++ b/drivers/net/sfc/base/ef10_mac.c -@@ -650,7 +650,7 @@ ef10_mac_stats_update( +@@ -612,7 +612,7 @@ ef10_mac_stats_update( EF10_MAC_STAT_READ(esmp, MC_CMD_MAC_TX_LT64_PKTS, &value); EFSYS_STAT_SET_QWORD(&(stat[EFX_MAC_TX_LE_64_PKTS]), &value); EF10_MAC_STAT_READ(esmp, MC_CMD_MAC_TX_64_PKTS, &value);