From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A3D16A0A0E for ; Mon, 10 May 2021 18:17:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3E9B44003E; Mon, 10 May 2021 18:17:24 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2045.outbound.protection.outlook.com [40.107.212.45]) by mails.dpdk.org (Postfix) with ESMTP id BD87B4003E for ; Mon, 10 May 2021 18:17:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FYq4LsH7HY/gwliO5icneGE4Z+0/U977ECdMRkswGgxaBnMkqkcXJpDI002JvmDejtWb+oeKKqSIfVWZNc7zSO2NYoqjcW4Zp2mDEHDRg9o8hIa69bFUcwk7KtPbC4A/rAQ4/4GvPLrJsqJNvJvC3bjGDhOKQPfd5uMHRuIMhP0CZBHmezB0FQEpO2TjfenceLJCbZvdDYy+qfjV/s2wppNipK43S+yq4tqwU/iDkVpXWbUJNSkZobfPKYJSUpl4UrewNGHuIQamw+ruCL54Gx7v7TmlAB/dmse5YRhb6czTnUe21lRwS1hRmzadDlpW9MwIiuKkPX0rRX4kQ8IA/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=34u5RqxC4ntLocYEFoLQxQmu3Gc5dQsw3EK8ZTEwgmA=; b=VXYbgDHOLDLwfQZSaEJSA8g1Ypd8EU4JyFKPn2Kq5JfInHZzRuhvaaQCCc78pVUv+y3rCRgZt6G+Tpq2jOBe7j1n/ofcd248HwW6tdb1WS3n9G2erDxfFtEK/lnKFTMBvwWyoSGqB0xnBSr+yEwjgLCFHstQT0Tc0ayClE6hDDLZonYrQ4ZIFkFSYzIuimyDjUtd4ZB1wAGxP1K1pjI+l7flr9QsifB+Y+8zIvQJCaz8hjuQPAvvQTuqD2U6CCFLyrzmFYxM0lWtUbRHxQyCysDLQ6cEiur/IzqlL0pBMwyNjQFsqqTBo+KgCROU755dKWE1YELqFaMUo0JeQEmmEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=34u5RqxC4ntLocYEFoLQxQmu3Gc5dQsw3EK8ZTEwgmA=; b=jePwwJvwpj1HvkptlqDc8cvoMhH3UVRp5WG2uK+146H1aehCzH6ixoksGx5Df/4Dsmqds/NOh1+i2JymO0CGHBWj5gbfPtCNSiWH3URHhshbGbeHqe4VAeHNZvun+9MrFCHPghNbYmym7HERxlRHc2DXa6Jo/jHDoEPpSCl4hhWMzMTsCLJ9tBS/B7+UuPWvAwiAnn1DMSQ6U1bGQN77AzDuse8ZHueINNQOoRbRvnIKvibsmeMDV2WEA/gkER2dx5WqD/7QnndmZYfsl/UOXx+6TXbj1AFnir0JpAksiabU4+dt1/cr3PBYE9hZhCWtwdf0VQreKibYRZEUITAzQA== Received: from DM6PR01CA0019.prod.exchangelabs.com (2603:10b6:5:296::24) by CH2PR12MB4647.namprd12.prod.outlook.com (2603:10b6:610:b::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Mon, 10 May 2021 16:17:21 +0000 Received: from DM6NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:5:296:cafe::c3) by DM6PR01CA0019.outlook.office365.com (2603:10b6:5:296::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:17:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT034.mail.protection.outlook.com (10.13.173.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:17:20 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:17:18 +0000 From: Xueming Li To: Alvin Zhang CC: Luca Boccassi , Haiyue Wang , dpdk stable Date: Tue, 11 May 2021 00:01:30 +0800 Message-ID: <20210510160258.30982-141-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6be0ee26-aae0-46d5-873b-08d913cf16b8 X-MS-TrafficTypeDiagnostic: CH2PR12MB4647: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4X7BnpGIME4xXnTmA9Zz1dTD73+0rhqIxne0NZFI1FYZ/bSmbRSH1UMa1/hGq5wzlf5PqVYvczjfgoQZHVuaTPLqhZbYgNKQc15y1pYbAhiz15pewPFTM4NHLvDZjDi2lkTcIJuDEQpKfCKHKStuAJoyAq2UWHJOK0lVEoYlylpztS7a/emFXB7KgW+7myHflpSQvEEYVjwTlSVYSzv4Mmy0K+/Gpwz646esk4eJGxnxaJX19Ex6vBVbMx0AksNZ8VuK4rgHoOpNExS4Ta6OYwYcsUaRfbpvjxHJybJTfNQQRJgPJmhze7ZVgAQp4hpdSkqxuaEoV523Shzi5iXFnEkTGOhZ7yojv1bnBc4fNHQCv8x71or/uoOsORGEIR4Xi/FALano3QEpIB1xQ1gmjVNxmmv0EWvpvg23oZ/ugr+293DQFJjtyt8eoic6L38y7t3tpZz9SwYH5SLhVTRCrwotc0UMG0aGDSUjb8y8Vs2jVOFvlsVkskNpzkr1/uEJpSXB9hpWskmbE8/84q/5xPpcaoK/Irb3di9odSKajV3hVTxvVMirokGSn4EURb/kq2stcfiDeOZ8gdoni+x+R95wRPHZ9co9VPXmhyz6S5iRycOKlXGUBRe+litkZs0GyxVLC9dDYMTQ3Cd7DQMhqThb44fEJMLRkehLS6tRF6hHcJngXI+tgAJqa9r24isG8PNFq2MeIe1Z+dj9NeDZcu5+eBxHRKI3ZpUFaI/NZShFiFckpH1p5BuhIm1vdBW4JPvZvdONNwHzUJDeuBZA5w== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(396003)(39860400002)(376002)(346002)(136003)(46966006)(36840700001)(356005)(86362001)(478600001)(70586007)(7636003)(966005)(82740400003)(186003)(5660300002)(53546011)(83380400001)(1076003)(70206006)(4326008)(8676002)(36906005)(36860700001)(316002)(8936002)(7696005)(36756003)(2616005)(55016002)(26005)(82310400003)(426003)(2906002)(16526019)(6916009)(6286002)(54906003)(6666004)(47076005)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:17:20.8526 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6be0ee26-aae0-46d5-873b-08d913cf16b8 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4647 Subject: [dpdk-stable] patch 'net/e1000: fix Rx error counter for bad length' has been queued to stable release 20.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/b1fab4dc0d5c372e21b2e497d50414ded0bac30e Thanks. Xueming Li --- >From b1fab4dc0d5c372e21b2e497d50414ded0bac30e Mon Sep 17 00:00:00 2001 From: Alvin Zhang Date: Thu, 1 Apr 2021 13:21:32 +0800 Subject: [PATCH] net/e1000: fix Rx error counter for bad length Cc: Luca Boccassi [ upstream commit 7b0a60dd394969fb17409519fd673e61b05f284e ] When the size of a packet in Rx channel is less than the minimum or greater than the maximum, the packet will be simultaneously counted by RLEC(Receive Length Error Count) and RUC(Receive Under Size Count)/ROC(Receive Oversize Count) registers. This patch fixes the issue of counting a length error packet twice when counting the total number of received error packets. Fixes: 70bdb18657da ("ethdev: add Rx error counters for missed, badcrc and badlen packets") Signed-off-by: Alvin Zhang Acked-by: Haiyue Wang --- drivers/net/e1000/em_ethdev.c | 3 +-- drivers/net/e1000/igb_ethdev.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c index 35be2d5aa5..b5244d06cf 100644 --- a/drivers/net/e1000/em_ethdev.c +++ b/drivers/net/e1000/em_ethdev.c @@ -975,8 +975,7 @@ eth_em_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *rte_stats) /* Rx Errors */ rte_stats->imissed = stats->mpc; - rte_stats->ierrors = stats->crcerrs + - stats->rlec + stats->ruc + stats->roc + + rte_stats->ierrors = stats->crcerrs + stats->rlec + stats->rxerrc + stats->algnerrc + stats->cexterr; /* Tx Errors */ diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 2337d5f767..7857be10cb 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -1827,8 +1827,7 @@ eth_igb_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *rte_stats) /* Rx Errors */ rte_stats->imissed = stats->mpc; - rte_stats->ierrors = stats->crcerrs + - stats->rlec + stats->ruc + stats->roc + + rte_stats->ierrors = stats->crcerrs + stats->rlec + stats->rxerrc + stats->algnerrc + stats->cexterr; /* Tx Errors */ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:30.244156400 +0800 +++ 0142-net-e1000-fix-Rx-error-counter-for-bad-length.patch 2021-05-10 23:59:26.550000000 +0800 @@ -1 +1 @@ -From 7b0a60dd394969fb17409519fd673e61b05f284e Mon Sep 17 00:00:00 2001 +From b1fab4dc0d5c372e21b2e497d50414ded0bac30e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 7b0a60dd394969fb17409519fd673e61b05f284e ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 3e7ccdbf09..a0ca371b02 100644 +index 35be2d5aa5..b5244d06cf 100644 @@ -39 +41 @@ -index a1a72339ba..25218da240 100644 +index 2337d5f767..7857be10cb 100644 @@ -42 +44 @@ -@@ -1825,8 +1825,7 @@ eth_igb_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *rte_stats) +@@ -1827,8 +1827,7 @@ eth_igb_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *rte_stats)