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 022A8A0A0E for ; Mon, 10 May 2021 18:06:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ED65C4003E; Mon, 10 May 2021 18:06:53 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2073.outbound.protection.outlook.com [40.107.220.73]) by mails.dpdk.org (Postfix) with ESMTP id 7C3CB4003E for ; Mon, 10 May 2021 18:06:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iSlKtI7IkUytoN+G7Eh0fEzLllBH17fIUkz3rjIRis4KdwC1xDQOhG8cwDq3ko01zGBnMTif4HkRQSONnwoScebBdzxQzPIlAbhs4lPPSNjBv7G2NInxhdt/8vKz67g8xGrxxq6SuFcqGq318vopmn6o5xS667sPe6G0zWvMTGS8d3qfvee62qkH/vblRCyBoOj/GmLrRNGvDzEMJ/ABhjPRQo07YAoPSOuD76nclz5iUnbfIpyPPCYlSG1c2caETiRENwV9JOmIow0TX4xiyMSdSPWqm8AcAe1XuOG5A06kXPLzzknetiMtJl5XH204Xjznlv3ivvLIzWqQy/bbLw== 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=qPsHmdzA54g9l9XH/gY37x/qMmDEVVbfjr9tea1K1/M=; b=dMY07YJIAxNviyBVCLQ1X3jm5w+ghWLMxPgemd/UMviXUh3eBgkUCtxTh0RRXJx9i3U5n3gK1YbRvwTeCT5yFhX4WSZ62ptnL6fOR8GH4jjRSclYNMUkbSDJNK7glqTbf+6QGFgnfOs3uvvUJSbbNIO/ITApCv0hvB11R2+ecfTQVEEP9Kb+JPf6P5wsxn7/T6c50Ea2cwrgUmaah+k8wj4xTGgEZFH2j/R3z7nGKpalD+P2JC1Vuh3icX81/mFewzHFnK1veIX27ariBBIplMTLiwkOZ/YEwfnviR3nHvNjJwOhSQKw5ZQOQWAjRGS8ZpTlNo1axGC1VqTqKGNttw== 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=qPsHmdzA54g9l9XH/gY37x/qMmDEVVbfjr9tea1K1/M=; b=Wi7sejq1HBYwbKptfQPaSknPvHNt2uOnOT+r2w7QQNrOiql6N+ROkpF/lyRBta1+849LOmE7Ir3zncA6KLlRF5vEJEuHkb/OjNGpY43Cw4Ji4klg1oqafqxPj3lGhCgR/lYPuhBMoTHoC0OOBLQTWGKEhLjMGKlyLPTw5rjVDzDBUjimBi9pnLxcX2IojRKVuIDwhjGRaOdUMAmNhB8yaTbP/INFFUjh4egtAWnx5ZioZzROK4Ne92Fz5h/Ruio2Bn0NxxckmTHWE30i4eFlOH7UfzuE/rS1VvsETTJOsxmQVxcIOtO38HXWEC4Qyb4K6Zsb3AnbZ1C6ZOoPZV+YFA== Received: from BN1PR10CA0008.namprd10.prod.outlook.com (2603:10b6:408:e0::13) by BN6PR1201MB0068.namprd12.prod.outlook.com (2603:10b6:405:53::12) 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:06:51 +0000 Received: from BN8NAM11FT033.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e0:cafe::50) by BN1PR10CA0008.outlook.office365.com (2603:10b6:408:e0::13) 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:06:51 +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 BN8NAM11FT033.mail.protection.outlook.com (10.13.177.149) 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:06:50 +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:06:48 +0000 From: Xueming Li To: Qi Zhang CC: Luca Boccassi , Jacob Keller , Qiming Yang , dpdk stable Date: Mon, 10 May 2021 23:59:45 +0800 Message-ID: <20210510160258.30982-36-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: d4702f32-7700-43e2-6c42-08d913cd9f42 X-MS-TrafficTypeDiagnostic: BN6PR1201MB0068: 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: 5YHwYE4rlwAFn4N4IK5zksNGyL7XOHV7Iotv/MuT50xpPypl3+ZNbKXwO8QEvKeaeyl+AuBO1XSpKqKAwQDJ27jfVMLgUzG7u7xTON0qFuwnQorFfKj2HSG00BmAvfEz8dW5vB2/NaPSZBhB3lGKBIUlfRkbmfvJhj8j0Xo+j0LCyOsJJawDv791cYZaAZLsHamqXURx7Lox+HRo1tEdJxIJgMsTbQhkPlHI3XYPGGWqXgWemm4A0ixgiLpdBqYNVh5o3q9GPqQzunFWCTXQVILXS8tJWhZQPoyc7UWfPkE2lIo7vejqEi3q78hU+INIMZP8f0ngGrb6D+Mf6mDuuh+XXx5o6fNFa+5szWE+WaxoHa07qBhxVKdYi8Hd8nerXYyWuQl/CiIxIfp9zaIMcSPkEP67ImMfaBxwp8XGEqic8dAk6gMSsu8W4NoEu810z9Vy3TneHqjqtfB+WVBjabU1uUd0JOAwiAL5HqgROFYrqbyI5yp8farxugK+/kwhErD3SW08HHeF/aFQpGFzBCu5gmUHzotWTY4gBvjvnifK0oxeW688CCMt6UMuagxIkx9LeQ4bsnGYvGeeO9Ahoo3NnNakIFCQK1Fy+USVJ00cXLWawnaTl0UJ5G0hFIxP2+C1xBba4PojiIRAO8m+Gk8JqpfKeb/TJDFY5bKiS/qI5wmnhpR2zcQD31E5kVt7VpRZrNhkNFu4dJg8ROLdE+VzxaZRuGwtOpiNXyhtVd8tig49o1uZzq7CWlgfc3JSAkb1NvJ2ctL5M9Rm1nHkZw== 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)(346002)(396003)(136003)(39860400002)(376002)(36840700001)(46966006)(7696005)(55016002)(36906005)(83380400001)(478600001)(2906002)(8676002)(426003)(7636003)(26005)(316002)(36860700001)(16526019)(36756003)(186003)(54906003)(86362001)(356005)(6666004)(53546011)(336012)(82740400003)(70586007)(8936002)(47076005)(4326008)(1076003)(82310400003)(5660300002)(70206006)(6286002)(2616005)(966005)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:06:50.9010 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d4702f32-7700-43e2-6c42-08d913cd9f42 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: BN8NAM11FT033.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB0068 Subject: [dpdk-stable] patch 'net/ice/base: fix payload indicator on ptype' 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/d4ef2f169e4d922a62efc272fbf491a368004fc2 Thanks. Xueming Li --- >From d4ef2f169e4d922a62efc272fbf491a368004fc2 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Tue, 2 Mar 2021 15:23:52 +0800 Subject: [PATCH] net/ice/base: fix payload indicator on ptype Cc: Luca Boccassi [ upstream commit 50fb95cb66d0dc993e98500a8384eb366b0d7b52 ] The entry for PTYPE 90 indicates that the payload is layer 3. This does not match the specification in the datasheet which indicates the packet is a MAC, IPv6, UDP packet, with a payload in layer 4. Fix the lookup table to match the data sheet. Fixes: 64e9587d5629 ("net/ice/base: add structures for Rx/Tx queues") Signed-off-by: Jacob Keller Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_lan_tx_rx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_lan_tx_rx.h b/drivers/net/ice/base/ice_lan_tx_rx.h index ec0c9f3ab0..7039cc8d92 100644 --- a/drivers/net/ice/base/ice_lan_tx_rx.h +++ b/drivers/net/ice/base/ice_lan_tx_rx.h @@ -1353,7 +1353,7 @@ static const struct ice_rx_ptype_decoded ice_ptype_lkup[] = { /* Non Tunneled IPv6 */ ICE_PTT(88, IP, IPV6, FRG, NONE, NONE, NOF, NONE, PAY3), ICE_PTT(89, IP, IPV6, NOF, NONE, NONE, NOF, NONE, PAY3), - ICE_PTT(90, IP, IPV6, NOF, NONE, NONE, NOF, UDP, PAY3), + ICE_PTT(90, IP, IPV6, NOF, NONE, NONE, NOF, UDP, PAY4), ICE_PTT_UNUSED_ENTRY(91), ICE_PTT(92, IP, IPV6, NOF, NONE, NONE, NOF, TCP, PAY4), ICE_PTT(93, IP, IPV6, NOF, NONE, NONE, NOF, SCTP, PAY4), -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:27.627007900 +0800 +++ 0037-net-ice-base-fix-payload-indicator-on-ptype.patch 2021-05-10 23:59:26.370000000 +0800 @@ -1 +1 @@ -From 50fb95cb66d0dc993e98500a8384eb366b0d7b52 Mon Sep 17 00:00:00 2001 +From d4ef2f169e4d922a62efc272fbf491a368004fc2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 50fb95cb66d0dc993e98500a8384eb366b0d7b52 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 107826acd0..e0e79cad95 100644 +index ec0c9f3ab0..7039cc8d92 100644