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 8CC05470E5 for ; Thu, 25 Dec 2025 10:24:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 601F940659; Thu, 25 Dec 2025 10:24:06 +0100 (CET) Received: from CH5PR02CU005.outbound.protection.outlook.com (mail-northcentralusazon11012014.outbound.protection.outlook.com [40.107.200.14]) by mails.dpdk.org (Postfix) with ESMTP id A24A640659 for ; Thu, 25 Dec 2025 10:24:04 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=I5k7oBhmvbCBfQrzZbMmjHV9w6MSRPTef9JHgVFrhmW2i5QsgopM0IGW27elN6TouYSUSLIWC/p8xJwAj4MUrD+lAAmJI3mor69hmNO1um/DRWdQlJrd+Mbd0+q3wwfaEcW1J5cH1yKn4D1o7Lw7ym4KfSDj6vX0fd41K6U8iWioiuOKE+p6dyBuacS6iH9YTPF0OMw21ZAQuqixhe+sIG8UIRjYdpbizIJx677+AqsNikAyrtEILfeUuewSsFAepVg1AdqRwvMntSpyiSuYH/IQwA3Uw4fIUPj4Oyi1x9fFh2oHgqRzY9Nj2fxASUuP7W6+YYgnTT7B6FkPV8aPzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=he8X61cmOcoWVgU6W485Sn/wrd0RLs83g0bMF8MdF7U=; b=lMz6xA7VEKUOkPCRBKdc4+wngLuVTg1UeYY5eYeCyek7rem31dHwqjNsXiKz6usR05vC+qNx2oQkGJ7XesnDi0rqzd+9UglHSGzTyZZmPHxnUwyAJZ7T+pLxLJjmfKJxb43RkhdLhIvxz/JTdXuT5z2KXu6iqos57ROg8W5rpFr+x8aqnOL0blif3f2gG43mivjFrwCLcyiv9mdtY9NcqfCIbqOT8v1QHITOvkMEAh19Aza87vdtqgR3OcHN0IKRgEu4vb1gRgeRy8sz9IQVKiS9Zrz4pngOf9rfkZdzVeXnVoFqBTPXdaCWXfHXkXlJcm++jbaOr1zlbrLUIs56dg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=he8X61cmOcoWVgU6W485Sn/wrd0RLs83g0bMF8MdF7U=; b=HuJT9B89mCiCwvCnbZvo9StQjZIHJ6Yp0r4xUQz7uvDJP/Ett8G1Q9SXd1fxMuIcUk5urK7N1r20jb0K+3iKNcu8lLKASfIcas7WtfR04wOSrMycgDwo8USDyjNKyXRpxFaBDkb66vEfWAfJIoojcMxPa6zDFWVbr4gLHtlo2pJlXyIRqJLitwNNcK6sN7WfKWM7C3UP22tN/7eO45eGvmXW8k1g5MrJMichPyCLxB0Xro9Kom/SERQn1zRBLVLkMQpvCYrvRmPTPB48Es4gZMWPFQljzGYue/26wI+3SJ8ujVhw1LflzdFTs1AskAfJCmYmfp/1i4kydFt6Khrbvg== Received: from SA0PR11CA0090.namprd11.prod.outlook.com (2603:10b6:806:d2::35) by DS5PPFD22966BE3.namprd12.prod.outlook.com (2603:10b6:f:fc00::662) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.11; Thu, 25 Dec 2025 09:24:01 +0000 Received: from SA2PEPF00003AE4.namprd02.prod.outlook.com (2603:10b6:806:d2:cafe::fe) by SA0PR11CA0090.outlook.office365.com (2603:10b6:806:d2::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.11 via Frontend Transport; Thu, 25 Dec 2025 09:23:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by SA2PEPF00003AE4.mail.protection.outlook.com (10.167.248.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Thu, 25 Dec 2025 09:24:00 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 01:23:54 -0800 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 01:23:54 -0800 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Thu, 25 Dec 2025 01:23:53 -0800 From: Shani Peretz To: Dengdui Huang CC: Chengwen Feng , dpdk stable Subject: patch 'net: fix L2 length for GRE packets' has been queued to stable release 23.11.6 Date: Thu, 25 Dec 2025 11:18:22 +0200 Message-ID: <20251225091938.345892-61-shperetz@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251225091938.345892-1-shperetz@nvidia.com> References: <20251221145746.763179-93-shperetz@nvidia.com> <20251225091938.345892-1-shperetz@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF00003AE4:EE_|DS5PPFD22966BE3:EE_ X-MS-Office365-Filtering-Correlation-Id: 2504f9f4-634f-4cd0-0336-08de4397566b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|1800799024|82310400026|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Hp86pWK7XhmotRwWO1q8vNk2jZG+xLw6FFaHyg2HTLmGryHh15WDOdbObelv?= =?us-ascii?Q?dQgb+wUXqe9alIaT+PZLVXP6y7DZLfVkD//Dqel1XDh8UWh+85Lf8/bj2xnd?= =?us-ascii?Q?X0R8oB2kBZDcAlEVPiKSTCBkAJY6hayTsx0p8drhmSWbyC0r4/HZ69W7Wjxt?= =?us-ascii?Q?seoPSupQZWgbDfpIBcZkmwlj6A0AGDoaG2MDxHPMs2dwdH7BGdBTqzOGBGgU?= =?us-ascii?Q?IiVVqwa/oRXDQvaXB9eM0XCtOOj/OK6Aq9v1QwJFgxmp6TmsXnM0dFSR9Z2F?= =?us-ascii?Q?BUrvfB1dJ+jJbtT0wgTFy+CczbBxYKzTsC5bKt55Ca3g3JInU5DiYfPBmR8q?= =?us-ascii?Q?laU3bn1EgyaagAWWw2tQK/L95qFoQdbfnP1oacRrzNDkgibok4ti/Ao9VBCv?= =?us-ascii?Q?IbBWGY7H4KVb8R4wzUXBNrsagX2UORpQCmcRDfdNshu0mk1Jm+pSRozs9VyE?= =?us-ascii?Q?cE4HnHKeGXyffftZcp/Uyfk3xzVU6lNlRoOGwf2boKzyvb+J7XkrDC0+eULu?= =?us-ascii?Q?+qFkvFv09aKhBD5WSQWEzLia4jZDBf3s7WikWGVwvr4J5T+w22DMHlHLj5I8?= =?us-ascii?Q?9qZ+PcL5eZ3P2X3bf4jdo5u9gIxc5wauAXMrWDaTXRzg8PYn9TyantyuwM1s?= =?us-ascii?Q?WcBu2StUR430Nv5A6/43qhbVkrOa+VNoPkQYnXmGTlSkuX8ZQIB339XZgjQz?= =?us-ascii?Q?X9kvYYhek/g1AU3IsjgHis389iIIgcB3oCumZR262kn+6RpYsvsfJC6F5FUH?= =?us-ascii?Q?duzUsFB84oVQdC7qexj4Lff1W7OcnVKXn3ALo4DzUwBhICdkV+xYtKXDcyGa?= =?us-ascii?Q?GwnTWibaYLb+i0ZJQ3wLx49lnj1qK4rkvW+kGz55u7Q5GlgXfzoXZuO5uyJl?= =?us-ascii?Q?DoVuqRFkN3xLAOD5bnoA1KuPtJGPOHa8m6FSoeNFWWMOClobRdtawBn08I7y?= =?us-ascii?Q?dnfPOnylZizeHtoOXHmn8fHHTNNhmKs3R3bgqubb56CFpD20gydumENcoenF?= =?us-ascii?Q?7ZbazIIDT4Y0wpi0IEfTpI+vY7CHivxtirSLn+SZHi15bqUiGh5ePVKDiJIV?= =?us-ascii?Q?g4am4bddn8fdxCxmP5OVv5zPj90PrXUXQLiOakzqvPr/1Mr1y3dIQrdSjlFl?= =?us-ascii?Q?KXfJyyQgCcl8KA5OjNex2L89RR3p0DcKkHPan95/LCWLCdRlktxupRtAr4FQ?= =?us-ascii?Q?MU5NCwexNR9rOdSEFauUtbVhwwaMovsaz2p3TkxuSENy8nd0V9vGSZ30dib9?= =?us-ascii?Q?zzF75Ge8Ny+RcDiu3aFL6XYXo6dr+WNzzllqWT9tndGL6igjJMiom7fPV/aU?= =?us-ascii?Q?8HbBjnSedwPX5BeaDbe/jeM+mK4Ty2riHnKMl5aXhqVETQPLSP/T69ngSSwR?= =?us-ascii?Q?VxVN0acYC0oayE0UZgx+eIkT7+yNgSbGTpahaPpmWkOM4/5cMva9q/c3DO+J?= =?us-ascii?Q?qfbPq6WbHs7jWIz23el5Joyoayl4Wn0/OoQDAsHOVw/YOFd0v3vny2HHrtbo?= =?us-ascii?Q?GP8HmV8hSV6EgEl/lRFQPwdHUCss/nGo1XnTuZB4LorL1t9GZY0VFQ2A00KL?= =?us-ascii?Q?0cXL4qoAxxkp7goDgB9xetoCf856ec9QfHZ/Atpr?= X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(36860700013)(1800799024)(82310400026)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 09:24:00.0861 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2504f9f4-634f-4cd0-0336-08de4397566b X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF00003AE4.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS5PPFD22966BE3 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 Hi, FYI, your patch has been queued to stable release 23.11.6 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/30/25. 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/shanipr/dpdk-stable This queued commit can be viewed at: https://github.com/shanipr/dpdk-stable/commit/130d79c519c554a713a4578e5d7a545a0e25e29b Thanks. Shani --- >From 130d79c519c554a713a4578e5d7a545a0e25e29b Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Wed, 23 Jul 2025 18:47:10 +0800 Subject: [PATCH] net: fix L2 length for GRE packets [ upstream commit cb699a047d1f2c1cead545db2d266ab5f396b550 ] The meaning of L2_len in the parsing result of the rte_net_get_ptype() is the same as the L2_len field in the mbuf. For tunnel packets, the L2_len should include protocol header of tunnel packets. Bugzilla ID: 1754 Fixes: d21d855464ff ("net: support GRE in software packet type parser") Signed-off-by: Dengdui Huang Reviewed-by: Chengwen Feng --- lib/net/rte_net.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/net/rte_net.c b/lib/net/rte_net.c index d680accc16..5862ed0776 100644 --- a/lib/net/rte_net.c +++ b/lib/net/rte_net.c @@ -376,6 +376,7 @@ l3: pkt_type |= ptype_tunnel(&proto, m, &off); hdr_lens->tunnel_len = off - prev_off; + hdr_lens->inner_l2_len = off - prev_off; } /* same job for inner header: we need to duplicate the code -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-25 11:16:39.428974661 +0200 +++ 0061-net-fix-L2-length-for-GRE-packets.patch 2025-12-25 11:16:36.001921000 +0200 @@ -1 +1 @@ -From cb699a047d1f2c1cead545db2d266ab5f396b550 Mon Sep 17 00:00:00 2001 +From 130d79c519c554a713a4578e5d7a545a0e25e29b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cb699a047d1f2c1cead545db2d266ab5f396b550 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 44fb6c0f51..c70b57fdc0 100644 +index d680accc16..5862ed0776 100644 @@ -24 +25 @@ -@@ -481,6 +481,7 @@ l3: +@@ -376,6 +376,7 @@ l3: @@ -26 +27 @@ - pkt_type |= ptype_tunnel_without_udp(&proto, m, &off); + pkt_type |= ptype_tunnel(&proto, m, &off);