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 70AC6470AE for ; Sun, 21 Dec 2025 16:01:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6B2A14025F; Sun, 21 Dec 2025 16:01:35 +0100 (CET) Received: from PH7PR06CU001.outbound.protection.outlook.com (mail-westus3azon11010062.outbound.protection.outlook.com [52.101.201.62]) by mails.dpdk.org (Postfix) with ESMTP id D93324042C for ; Sun, 21 Dec 2025 16:01:33 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cjsDDTZJe154uQz8zjjaaUwOsZhj9RcexM1avJcFCiHYLe1ZATJnrYWdoE94wUvfC3UHklPR22sCUUEYRF2j9bqwU7KQBz8sfgePDx47Zk/zTx7jv5X5J5WKxbvdKAoG7rcOh25yE9d0vqvPcENb3djSDs42APRUIk+NsIXC+vLzhN8pYoRObyZkhrqsKBj3vQxHUBAjvCzabugl+TdCv41JvCFxvMW0jMpNNomuJiwW43uYu1zNejU2bSr72E/2fsUD4hROE7qlGboGVFjRNQ68sG744YQpJIN7gNFmZ3gSsdI3618DnP+oAcCNr8hESjvtjXwZLkr5CkXhscqVEg== 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=mw7MfvFUH/WXTq3o49eNNS35egtdHKsUuI34Oi69rvQ=; b=nxaOTWdnoCfC2zs7v58OPJ1uITrIo2z0tygCVWd2VbhDK4jeQEUemkEiyGU9xu3yBmJLo9hT3WFD3u+/ZgTgMTkWqsn2A1P5c/IfsbCuFp6y9CM5xd0n6Ud0zoo5sUK3GuBDT4/7LTtMQPPZrEbwPno/PDiOMbG83D/tRqTV4knuCKZXlWO8wg3EZqNReH5W+2kkxgJ/DNNqc5zV+dcoe6a4ObG0mHJch7dP/fNvlYSWaH+UPY4c0JLPYIIUXX7Xr3jUGgJUNkHFz9KGLTIU0T+d4+LAW9tJPPurtadtwNoIeDycPKPIeOxzox18VxnhVN4Redxz+IZr5S57WzRdKQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=gmail.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=mw7MfvFUH/WXTq3o49eNNS35egtdHKsUuI34Oi69rvQ=; b=LQndI13eOlsqBZlTq5NMwcQl+LnDWCxPhskdZo+AHOuIJqQ+Wgemx5K5UYkUKDkgrZvPb9aV/B5HKa1qveYXNzrDBtDcGtrtSZuX8M+FQug8w+vBi39H4YoQ3v09BoZ9Q7Zxt0Zz4u3P7HCPID2ERiSyBadvM9iyNk/owDDyQtACMylzxb66LxXVGco3ABCJfXyUE+ckRvMz7gLDMbjeYnjDXDqnNaKG3TN+cuJsg+pMzof0c7Byyvic2vzaau32pU35a4p2eMiHdEPLP8omVYG4JS1g9Xs5FG1tWKqcO4/fbfk0rijA522j73uAUZ1fV6Me79pJR9kf23Goa1JxSw== Received: from BYAPR03CA0023.namprd03.prod.outlook.com (2603:10b6:a02:a8::36) by DS5PPFBB8C78349.namprd12.prod.outlook.com (2603:10b6:f:fc00::660) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.10; Sun, 21 Dec 2025 15:01:28 +0000 Received: from SJ1PEPF00001CE0.namprd05.prod.outlook.com (2603:10b6:a02:a8:cafe::37) by BYAPR03CA0023.outlook.office365.com (2603:10b6:a02:a8::36) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9434.10 via Frontend Transport; Sun, 21 Dec 2025 15:01:31 +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 SJ1PEPF00001CE0.mail.protection.outlook.com (10.167.242.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Sun, 21 Dec 2025 15:01:27 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) 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; Sun, 21 Dec 2025 07:01:20 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail201.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; Sun, 21 Dec 2025 07:01:20 -0800 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Sun, 21 Dec 2025 07:01:19 -0800 From: Shani Peretz To: Tathagat Priyadarshi CC: Kumara Parameshwaran , dpdk stable Subject: patch 'gro: fix payload corruption in coalescing packets' has been queued to stable release 23.11.6 Date: Sun, 21 Dec 2025 16:56:26 +0200 Message-ID: <20251221145746.763179-38-shperetz@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251221145746.763179-1-shperetz@nvidia.com> References: <20251221145746.763179-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: SJ1PEPF00001CE0:EE_|DS5PPFBB8C78349:EE_ X-MS-Office365-Filtering-Correlation-Id: b078ce3b-568e-450c-f3dd-08de40a1d158 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|376014|82310400026|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?R5Zaqpal1WcFxifjHZ1ik0YE2wWeRTpx19vaiHmig0LsjjwLDJelyjgWPMaR?= =?us-ascii?Q?XfiVNwv4wemrIUA/0EQtVaKUcVgGuTLMzPJOUqdpSISlAv/DB9TIcxFmkSla?= =?us-ascii?Q?02FWFBQPuZmIvgAWEraw6aIdCYJwaZpDjQg7XTga0MOX44XxQI773lz08pty?= =?us-ascii?Q?k402Pde9zFgg22ciLVTYqObr3TyzyOuQQu6WrWJKEU8t3v8o3045rCjZbA3n?= =?us-ascii?Q?A8Icu4OM7MTq9N0pGe8EfGlGVe0mdCbz2c/IGRhI+/elySCvUYQtQ+b4zAoc?= =?us-ascii?Q?yL4llCBKUHETe2VeEHSPCWH6tKUzHVeJpRmBk9nWaHnK6zFofUNGyaSYtFpF?= =?us-ascii?Q?Npb1aa/61pi+7vewUlO4rbSnJRY36ElPu0Q1dlTQ3/5qR1M/Xtq+bvG7ZuHX?= =?us-ascii?Q?LqeY2Nk04c4Az5X6mDliylMz3SPIKrMdsec0AtCrIn6z0WRrpOVnJMhVImbo?= =?us-ascii?Q?wme7w+yunVWmmS8uUsOgVj9hV4AqX+6uaghSv283PNp6uB1VVsz7dlTuGwxj?= =?us-ascii?Q?7PVvGs7kc5iviVEeUopssQQ8FJkW3thCmud5zJ539YRGuDXykDXMsenxpj70?= =?us-ascii?Q?2+YgawiqpSPBAOWVWqzKZZDJshbif0hqXeRAIdtzhH6ijkD4HnFOAA2peGxJ?= =?us-ascii?Q?SZM29PLUgWkvecxkIjZx3K/95m9de0O+XRYGIFYqgLlu6c4KPWvl0acGIUlQ?= =?us-ascii?Q?cheYm1PH+hXDKS/atP3RUtDZaLzTz2b2z7J4YJSLpeSplIeY4O1jto4ZO0qk?= =?us-ascii?Q?/vtC3QHjezEalpRmAceoRY1P5nE8n9bQ5LNcuRRF0zg3cOmU16BU2A+R3Qmr?= =?us-ascii?Q?+OqIDfLZSptt9BqJZrJGjbhTFh0s6lHxd/vGk51YSF+OAfr9cJzKjs731gkC?= =?us-ascii?Q?yEUBK8oCbSSZCdGIqeeuIjTWE0BrnlF4m2H2vNo3jP4yqqcvDHNk59qJd41p?= =?us-ascii?Q?JKODyk4crhoE1BYjyQvIqdJe44PI0YDdfHA8+WsFfGw80qMcLQISC+PPSBbG?= =?us-ascii?Q?kB/IIvtNh/T+6ztfvhunI2MjeHMwG2rb5jJRBwTaZEl+L5SdrQNjBM9gpdZh?= =?us-ascii?Q?sDnMaXUlThiqyX/UDX1uH5UcUrz0ntjxayXo+dCAMilZnq3aahtEXXwATXQl?= =?us-ascii?Q?867N13pPVP3if+6WakkEMpPp1KQqpyJ1cFuRyCVQA0HQvDLTiYz4oUXq2vFs?= =?us-ascii?Q?i30TYPT+BKfKFbNb6z37vylVXWm/NeAh2U4++TMH8+aY1pZerJmMIePpLv7v?= =?us-ascii?Q?9PYfYjE9eYOP3CaSirYJ+qkdWqCLFTN4MaCflPmj0nrRvyYLXcnPJlsHuVJP?= =?us-ascii?Q?ohHa4tcdpPoTdR9yUid8iZILam5RAD6Esx0v6K//yTF9NJKXra3XNqOYrzSd?= =?us-ascii?Q?PlNrl+H9Hw32K52LXCevjvUaM54Y2DCGiLU5GNt+Ebgblmt+zZg9Z9uQ32F0?= =?us-ascii?Q?AMFVeLcWGV0y3HFi6q8zSFKMEktUUblTPNkBj2GMbCbwOaJd5oSzgtPMIN0W?= =?us-ascii?Q?NI5ggZtCvCp27JyAtCFOBhSNkCywGjqE97Akype+OproJU1AvKDJZ3lCLFu/?= =?us-ascii?Q?o7LjaEUcfvqBbkSS5WoR+OVaZXRXOM/6dphLUVmC?= 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)(1800799024)(36860700013)(376014)(82310400026)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2025 15:01:27.9116 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b078ce3b-568e-450c-f3dd-08de40a1d158 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: SJ1PEPF00001CE0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS5PPFBB8C78349 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/26/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/da3a55919905bf172a393a4b8e1bee813b5e0cac Thanks. Shani --- >From da3a55919905bf172a393a4b8e1bee813b5e0cac Mon Sep 17 00:00:00 2001 From: Tathagat Priyadarshi Date: Tue, 2 Sep 2025 10:44:51 +0000 Subject: [PATCH] gro: fix payload corruption in coalescing packets [ upstream commit 33358ccc291fbc39d93b3c3975bebec1c38ab56d ] In the current implementation when cmp is larger than 0, the new packet is appended to the original packet. However the code is operating on the trailing packet to update the tcp flags which ends up corrupting the payload of the trailing packets. Fixes: 547f29435769 ("gro: fix reordering of packets") Signed-off-by: Tathagat Priyadarshi Reviewed-by: Kumara Parameshwaran --- lib/gro/gro_tcp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gro/gro_tcp.h b/lib/gro/gro_tcp.h index 2c68b5f23e..3d3295e7ec 100644 --- a/lib/gro/gro_tcp.h +++ b/lib/gro/gro_tcp.h @@ -133,7 +133,7 @@ merge_two_tcp_packets(struct gro_tcp_item *item, pkt_head->nb_segs += pkt_tail->nb_segs; pkt_head->pkt_len += pkt_tail->pkt_len; if (tcp_flags != RTE_TCP_ACK_FLAG) { - tcp_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_tcp_hdr *, + tcp_hdr = rte_pktmbuf_mtod_offset(pkt_head, struct rte_tcp_hdr *, l2_offset + pkt_head->l2_len + pkt_head->l3_len); tcp_hdr->tcp_flags |= tcp_flags; } -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-21 16:54:19.286392842 +0200 +++ 0038-gro-fix-payload-corruption-in-coalescing-packets.patch 2025-12-21 16:54:17.017034000 +0200 @@ -1 +1 @@ -From 33358ccc291fbc39d93b3c3975bebec1c38ab56d Mon Sep 17 00:00:00 2001 +From da3a55919905bf172a393a4b8e1bee813b5e0cac Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 33358ccc291fbc39d93b3c3975bebec1c38ab56d ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index e9be7b95d1..43383e47e0 100644 +index 2c68b5f23e..3d3295e7ec 100644