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 10AE1A0A0E for ; Mon, 10 May 2021 18:17:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0A4B140140; Mon, 10 May 2021 18:17:04 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2061.outbound.protection.outlook.com [40.107.244.61]) by mails.dpdk.org (Postfix) with ESMTP id 4CEA2406A3 for ; Mon, 10 May 2021 18:17:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k5GScCmNP+jGQq89khw8J84SvF1z6CuTWpdHE+sv124q3srYraVhQY24uWSOneigsgNG3WXaARIhfiRTRWkUKj2cCtiF6wzqTZVEat1+mNH0iZn3IBlOQgI0QLygKFQdz3VY4xWdXzLA7gdblp0zdypmHa9AnHFDbAujw57pQy4cNLren2Rzz7GrrhR+349AenXMD3eO7hPv8AERNg4eooFWZnc/d7pyhihyx3j36PZP9Qkgd+CxQtDEPXApmqnRA7GqmgjF8Lv8zCb2XXO5EgC3T3pQg04N4FrBRVE4QBcX/aXNynhvV86g1YkDXrlE60PKmxGtcydjE1xXFPRw2A== 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=G342brc7wPQgnbE9MPVxalPduqvwN3hZntiuyfRVmr4=; b=B1sS0bevNGYqIgR5p/w4bynehkVobIuytlRF0zJa/oF56rW2gQ2VqcOdWzlkT4FhYtiCVy7eU9+AS2Lk/S+8avqJzIkOYJLAZjOq3YTce14863sY9fw3pEKfaJK1iWV6X/YkndVcaY0xSkqC/31NQc/O01pynLUBlaLAkrFgpROTlZAjK66W+zJqBJ3x1MCTwVj/B1NpKEA9bPv4Z5kHiwQi1GX9NKG8X7t2m2DkZpVuwf1t3QQV/K/WFJqhO1yG0IUSwQYe26Js7pwZKR6vaqHA/4GTqENi07OqYWK5QZOdFF4LfQyEw1w3auIHN6W/UFnszSv+C/S+sBYerlBCDQ== 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=G342brc7wPQgnbE9MPVxalPduqvwN3hZntiuyfRVmr4=; b=mLd+pf56/Yd/OZlvOBLVs0XPrGqWw/M9wKOfCe7ZpV0IQvpL5UCqSsgM03d0AxUipnOKdmMljrUp05fUJj3v5puYsUL1mjY/aQgHUE6xrVA2vq6wCEW3eTJJTkRPm1AVUeUAr5Y5Oiang8RoaSg+MXvPDAX9onFp6ChSd3qYFoltGhOD9RqoN0rLQo6aTBuKEsvIA3HltObSVHs6A3vOjFYHEWpQofXo4gfBkMkhT4wnPAUS+DjdR7zP7j0+ec92VFszmoVwnUA0Y9svlQv8p8Z691L3i8yzs4NJj44LrmbTKNwYZnFRBj1eRdM3hgJX+tYTGYkgEflwFC8w9BqtQw== Received: from DM5PR08CA0055.namprd08.prod.outlook.com (2603:10b6:4:60::44) by BN6PR1201MB0018.namprd12.prod.outlook.com (2603:10b6:405:54::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Mon, 10 May 2021 16:17:00 +0000 Received: from DM6NAM11FT057.eop-nam11.prod.protection.outlook.com (2603:10b6:4:60:cafe::3) by DM5PR08CA0055.outlook.office365.com (2603:10b6:4:60::44) 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:00 +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 DM6NAM11FT057.mail.protection.outlook.com (10.13.172.252) 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:00 +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:16:58 +0000 From: Xueming Li To: Alvin Zhang CC: Luca Boccassi , Haiyue Wang , dpdk stable Date: Tue, 11 May 2021 00:01:29 +0800 Message-ID: <20210510160258.30982-140-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: c0efb3c4-66f4-458f-eeda-08d913cf0a49 X-MS-TrafficTypeDiagnostic: BN6PR1201MB0018: 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: lDz4ZO5kzLPsTiis07vKxwHgKte/ZfxEuxda0VvTctntssOVWqV5Dyb0+MWTewwrAlQg07uQaVoYu09IYWJ3cJORdUzxBoURVJgK9Jc2eU8IJb0+BaIlaGhz+dwtpV0D1N8MrEzoM59J/w21riCtK2BJSgcLxJGkPwtdRtCM+W3xcDGXz+2wEWg29Ee7/A7pb/NTxLzKLGPE45+psgMj7/ORihPtAMSwI+SFuaPAqWpawFEecoUOUxlEkIZF/nLQp5PbXUtoQ+HbC+oG9jmzyUF4maplRq9Airl5uyr/An7PHZV5BfiD7otS+62sVgcpiBE79PGWa193n6U7tq7XBGS3SHwov9lbYRJWB+3fVtVBsVt0OofEHh5Hwl0meYNR1PHOchHUUGI1Srywmna+1CoWXNchnbb9WM7Cm3xzCeCxK+YOWE6zsyoTljYBAMq3dCWrptsfks0TztHJ28ez9qJn7HM4PoSbB4OZxlKyfVb0NDUxbUvyxqmO632bFxiqwy35UAkWsndROz1qvnn07WjCkz7qJeMUB1hPanz+NVzkuEOiN+bmbz//VY3toRsu01yzUuaF1LF5GIjsax1tqifMgGFMpz3qzcz0IL+iiQ4WT/DJe8MyMysErO/Sf2+9iw4lEwg4nP6EdkJGVVrQP8+rncd16bERIVLO3IT19U5eHOxn9xTd5CC0SBPfQnQwHBzUmKrkE6Or1cITmWU1G2FvoDyoB9Efb0J1M025W2TQGyJMGu7tSUJQs547cTOl4NLtCgeJ1kiyNcCvhym5HA== 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)(376002)(396003)(136003)(39860400002)(346002)(36840700001)(46966006)(6286002)(186003)(316002)(6916009)(36860700001)(36756003)(8676002)(7636003)(7696005)(86362001)(8936002)(54906003)(336012)(478600001)(356005)(426003)(36906005)(5660300002)(82310400003)(2616005)(82740400003)(53546011)(16526019)(4326008)(70206006)(70586007)(2906002)(47076005)(1076003)(6666004)(83380400001)(26005)(55016002)(966005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:17:00.0241 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c0efb3c4-66f4-458f-eeda-08d913cf0a49 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: DM6NAM11FT057.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB0018 Subject: [dpdk-stable] patch 'net/igc: 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/fa6df61bf20ad0017eb598eaccd6df10fa8498ac Thanks. Xueming Li --- >From fa6df61bf20ad0017eb598eaccd6df10fa8498ac Mon Sep 17 00:00:00 2001 From: Alvin Zhang Date: Thu, 1 Apr 2021 13:20:43 +0800 Subject: [PATCH] net/igc: fix Rx error counter for bad length Cc: Luca Boccassi [ upstream commit c69abf624a3c84aa6b1cdfe953dcab9ff35deac2 ] 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: e6defdfddc3b ("net/igc: enable statistics") Signed-off-by: Alvin Zhang Acked-by: Haiyue Wang --- drivers/net/igc/igc_ethdev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c index 2d9bbb835d..a1152f9deb 100644 --- a/drivers/net/igc/igc_ethdev.c +++ b/drivers/net/igc/igc_ethdev.c @@ -1904,8 +1904,7 @@ eth_igc_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; /* 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.220166800 +0800 +++ 0141-net-igc-fix-Rx-error-counter-for-bad-length.patch 2021-05-10 23:59:26.550000000 +0800 @@ -1 +1 @@ -From c69abf624a3c84aa6b1cdfe953dcab9ff35deac2 Mon Sep 17 00:00:00 2001 +From fa6df61bf20ad0017eb598eaccd6df10fa8498ac Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit c69abf624a3c84aa6b1cdfe953dcab9ff35deac2 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 17dd8bf8c6..31c99dca09 100644 +index 2d9bbb835d..a1152f9deb 100644