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 7D1A8A034F for ; Wed, 10 Nov 2021 07:57:41 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 77F20410FE; Wed, 10 Nov 2021 07:57:41 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2085.outbound.protection.outlook.com [40.107.244.85]) by mails.dpdk.org (Postfix) with ESMTP id B307441100 for ; Wed, 10 Nov 2021 07:57:40 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bQPOmaw0D18veiuw8JcfAyl9q69M6JJawI2P6ERq2+mHuuHV6ST3pRAKy9we/W0TXRAA+BFwwZdI4zPhLGASF6T9Io0gOaMhpKSgJmL0UQSskYjD1QnSxtKUoJR/DzzRtZtAAoxTsC9N4NCpv5NNO+VUSTBk6DB0nYhfFJ/XaOWjlP6Jm6rP9T8EyuMhw1R2P3BAGaYWzWGoSjzl4bYmcWNV5yYv8i80uDcC5TvDNejNdPKiB9ER8f7BEeWoqVFhGQLSuJSR/3bwtIkPb+AbZ7tyf6aelJ5Mz3G2a6ri97KXYfCX91chJbKaGJmEwugaXwTKx7lIY9iXLCtH7a35Lg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CjySDs8dKQK+nf9A6LtWJzTSmBNYr5xHhyifFksy+dI=; b=KSXsK2Z2Z7J0tlrh9wW3QHQJFn327DTqR4b2OxrXLfE9sGAw4RDDJQR3EtFAKuwXRrrsOwuaQfc0mXJlyYap4YLlN0IRkkIdFpNPOFOnP/LxmhfkZvBGNACF3v7TR5FnlT5h6TJG778mdAWSOrCfyuLHLeR3iZ0igcGGixwsyoZIehWT3QEGcSSjVUDbTUtuUpROp42aU6GIwD0nIotuTe8F+QDBGzUArYw6I3BwNFWFSgZHAygC/Ibxpo4k2z2jeGY1PX+pttOJapH1rrFUY+wEHLWAVShNkxO3NUfLJpc7RaDqnOqHB+P1A7NNzMP2XNniGZG5/SXL/G3znaiygA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=CjySDs8dKQK+nf9A6LtWJzTSmBNYr5xHhyifFksy+dI=; b=ecr5stIvB7gn2fv0pmkOV7seKSwvGOnBPX+FocZmygAznK0sEpo6bBwjKNEvmkctep5BQFb+0O93kT6L6QUzCSjhHVu6z9Yx3QC97LPvUQaUsSJPRvGyFsmxd/4l132Jy/HK7zmaO5R0Vtyy+AT84ZzAoNPIl3hoEYiEl8BBPSpz/sdT9ukR7+PsirDrihrntEX9ckLIHGRWtai+OmZCM4Bm+BOHzq36FrtsRcweLkzeQ8yphBegT5BJFchIvQNA1g/xwy4gxx3PesonE/qzzrcJkSTTwptLJ/ruI8f+2WXf9ausfCm5C/tEjE5lK0C0tBXRxIxZO+BBp9KAN0YRsg== Received: from DM5PR07CA0097.namprd07.prod.outlook.com (2603:10b6:4:ae::26) by DM5PR12MB1786.namprd12.prod.outlook.com (2603:10b6:3:112::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Wed, 10 Nov 2021 06:57:39 +0000 Received: from DM6NAM11FT051.eop-nam11.prod.protection.outlook.com (2603:10b6:4:ae:cafe::c6) by DM5PR07CA0097.outlook.office365.com (2603:10b6:4:ae::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 10 Nov 2021 06:57:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; 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 DM6NAM11FT051.mail.protection.outlook.com (10.13.172.243) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:57:38 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:57:31 +0000 From: Xueming Li To: Jiawen Wu CC: Luca Boccassi , dpdk stable Date: Wed, 10 Nov 2021 14:31:51 +0800 Message-ID: <20211110063216.2744012-228-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: abdc8715-9859-447b-c033-08d9a417622a X-MS-TrafficTypeDiagnostic: DM5PR12MB1786: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H7YdPwSg2cP59fhFzbJFXq3X1YsHZzkouDA9d4Q+3D3fjo8Vawq2lmHnww8saMsdlbmvDOvDrpzhP6GFUAfX2mN310jj5ZUVf3fLYApp3ysTxznWAHeFoL8WmEnnMy8FCLwXcBjfAsJgtQbXvBQWxSLHTY2uNmJ7C/ToP9ISgAdEyinFRWl3zSp51LhjNTTcPgVpVFJOyXwfsWw8pDgoJYwxw7aGVwOPFI+LnMiRiYTzDj8LaF3lzUcnjDH8BSK2iU2cxEtPuRIk76x8kvo1U3QUaNoHg4d71yl0cNIKmag/j3AazKNkKo6VNutgsuDawmhPPfVU0K9AiH4UXUagI5dCltN/KObqOUttI/hme2BlkbZhdhyJLX0FDBqtff8SCxtC0A9SxqBzPlx7UoaOsDN96pe7JM3i3mgD+7LF2xDKzgoCpFNpLo03ZAO1C2caSOguttVDJ++oZGCfe6YbWwNUlSAThf4ZBr+yo0Bup7peiUJyEt6Ix4ptTHowd5GuhruhycOmnfSQg6Xpe72ChtDa+FvwwUajO+jFZJ13L3aoiYqjjPf343r6Vdh3gdvflbsde6UmBsNTQNZVMZQzbLv9kUW7jwILg3BJNuYC+UiN83DqlRu5BiFL2i2nkqK5OHbWniVuThPU+kDrQwcJMSmVwF3lviKgq4RyqO22QaVXbT5BuDfNivMuMMWg13N+nPcSg30LgcAn1SmizcN0J9hyPGrvVTzYoalcGYLmX9F+fwGU9gfsBMLRNl0hoKk8Wog4sS0ab5bVeSZhQ4LmlrCzc+0yPE1VPDdMXqmlsluqH7oh6uNP2ltnLK50cR33p8UHckWvkJqSHVdgX1Kyew== 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)(36840700001)(46966006)(4326008)(36860700001)(70586007)(2616005)(508600001)(7636003)(86362001)(70206006)(83380400001)(426003)(47076005)(36756003)(1076003)(4001150100001)(7696005)(82310400003)(336012)(2906002)(966005)(54906003)(6916009)(356005)(53546011)(6666004)(6286002)(16526019)(5660300002)(55016002)(316002)(8936002)(26005)(186003)(8676002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:57:38.6758 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: abdc8715-9859-447b-c033-08d9a417622a 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: DM6NAM11FT051.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1786 Subject: [dpdk-stable] patch 'net/txgbe: fix packet statistics' has been queued to stable release 20.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/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/caefd6b5c0afab8ac02b7ce1b653bed4232bb464 Thanks. Xueming Li --- >From caefd6b5c0afab8ac02b7ce1b653bed4232bb464 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Tue, 2 Nov 2021 16:10:25 +0800 Subject: [PATCH] net/txgbe: fix packet statistics Cc: Xueming Li [ upstream commit 3d4f43ea310e44ffc2b89b2306ea40707c290147 ] Fix specific length packet statistics caused by wrong register addresses. Fixes: 24a4c76aff4d ("net/txgbe: add error types and registers") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/base/txgbe_regs.h | 48 ++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/net/txgbe/base/txgbe_regs.h b/drivers/net/txgbe/base/txgbe_regs.h index 83c219a6e2..3314975935 100644 --- a/drivers/net/txgbe/base/txgbe_regs.h +++ b/drivers/net/txgbe/base/txgbe_regs.h @@ -1071,30 +1071,30 @@ enum txgbe_5tuple_protocol { #define TXGBE_MACRXERRCRCH 0x01192C #define TXGBE_MACRXERRLENL 0x011978 #define TXGBE_MACRXERRLENH 0x01197C -#define TXGBE_MACRX1TO64L 0x001940 -#define TXGBE_MACRX1TO64H 0x001944 -#define TXGBE_MACRX65TO127L 0x001948 -#define TXGBE_MACRX65TO127H 0x00194C -#define TXGBE_MACRX128TO255L 0x001950 -#define TXGBE_MACRX128TO255H 0x001954 -#define TXGBE_MACRX256TO511L 0x001958 -#define TXGBE_MACRX256TO511H 0x00195C -#define TXGBE_MACRX512TO1023L 0x001960 -#define TXGBE_MACRX512TO1023H 0x001964 -#define TXGBE_MACRX1024TOMAXL 0x001968 -#define TXGBE_MACRX1024TOMAXH 0x00196C -#define TXGBE_MACTX1TO64L 0x001834 -#define TXGBE_MACTX1TO64H 0x001838 -#define TXGBE_MACTX65TO127L 0x00183C -#define TXGBE_MACTX65TO127H 0x001840 -#define TXGBE_MACTX128TO255L 0x001844 -#define TXGBE_MACTX128TO255H 0x001848 -#define TXGBE_MACTX256TO511L 0x00184C -#define TXGBE_MACTX256TO511H 0x001850 -#define TXGBE_MACTX512TO1023L 0x001854 -#define TXGBE_MACTX512TO1023H 0x001858 -#define TXGBE_MACTX1024TOMAXL 0x00185C -#define TXGBE_MACTX1024TOMAXH 0x001860 +#define TXGBE_MACRX1TO64L 0x011940 +#define TXGBE_MACRX1TO64H 0x011944 +#define TXGBE_MACRX65TO127L 0x011948 +#define TXGBE_MACRX65TO127H 0x01194C +#define TXGBE_MACRX128TO255L 0x011950 +#define TXGBE_MACRX128TO255H 0x011954 +#define TXGBE_MACRX256TO511L 0x011958 +#define TXGBE_MACRX256TO511H 0x01195C +#define TXGBE_MACRX512TO1023L 0x011960 +#define TXGBE_MACRX512TO1023H 0x011964 +#define TXGBE_MACRX1024TOMAXL 0x011968 +#define TXGBE_MACRX1024TOMAXH 0x01196C +#define TXGBE_MACTX1TO64L 0x011834 +#define TXGBE_MACTX1TO64H 0x011838 +#define TXGBE_MACTX65TO127L 0x01183C +#define TXGBE_MACTX65TO127H 0x011840 +#define TXGBE_MACTX128TO255L 0x011844 +#define TXGBE_MACTX128TO255H 0x011848 +#define TXGBE_MACTX256TO511L 0x01184C +#define TXGBE_MACTX256TO511H 0x011850 +#define TXGBE_MACTX512TO1023L 0x011854 +#define TXGBE_MACTX512TO1023H 0x011858 +#define TXGBE_MACTX1024TOMAXL 0x01185C +#define TXGBE_MACTX1024TOMAXH 0x011860 #define TXGBE_MACRXUNDERSIZE 0x011938 #define TXGBE_MACRXOVERSIZE 0x01193C -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:11.919468798 +0800 +++ 0227-net-txgbe-fix-packet-statistics.patch 2021-11-10 14:17:02.054077924 +0800 @@ -1 +1 @@ -From 3d4f43ea310e44ffc2b89b2306ea40707c290147 Mon Sep 17 00:00:00 2001 +From caefd6b5c0afab8ac02b7ce1b653bed4232bb464 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3d4f43ea310e44ffc2b89b2306ea40707c290147 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index 48d9300a2e..144047ba62 100644 +index 83c219a6e2..3314975935 100644 @@ -21 +23 @@ -@@ -1072,30 +1072,30 @@ enum txgbe_5tuple_protocol { +@@ -1071,30 +1071,30 @@ enum txgbe_5tuple_protocol {