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 7EFB148A44 for ; Fri, 31 Oct 2025 15:37:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 670BB4066F; Fri, 31 Oct 2025 15:37:23 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 5DB4240666 for ; Fri, 31 Oct 2025 15:37:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761921441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rsQE5o/7+IGd8Na84PLVqCGNyTVam0DIqyRZ5pHeVnU=; b=YS26JkP3AGFhmqQ9vdZ8gZzsW1X1tI6ZUMYnc/gNM4MCGUys1A1ucNsORWaJNynW7QeCaE B6wnbRj1ldweeLy0RzuGIt8RwND6p8CUJh1Y5EFITnB43sbyg5a6qYMZeKl17p/LFIVfmX PVVtU+CGo+dNtddbEypxRQvGOy99LcI= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-509-Sam-4fMUPPmMct8ttmiTYw-1; Fri, 31 Oct 2025 10:37:19 -0400 X-MC-Unique: Sam-4fMUPPmMct8ttmiTYw-1 X-Mimecast-MFC-AGG-ID: Sam-4fMUPPmMct8ttmiTYw_1761921438 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8424D195608D; Fri, 31 Oct 2025 14:37:18 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.50]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F080E180057E; Fri, 31 Oct 2025 14:37:16 +0000 (UTC) From: Kevin Traynor To: Tathagat Priyadarshi Cc: Kumara Parameshwaran , dpdk stable Subject: patch 'gro: fix payload corruption in coalescing packets' has been queued to stable release 24.11.4 Date: Fri, 31 Oct 2025 14:32:53 +0000 Message-ID: <20251031143421.324432-51-ktraynor@redhat.com> In-Reply-To: <20251031143421.324432-1-ktraynor@redhat.com> References: <20251031143421.324432-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 4soEOKGvBqOj_vazrPKmX1SzvN5Xm0Z_Diab9ql7Ef0_1761921438 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.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/05/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/762a9230466908583f80754a51f3349754e5b4c3 Thanks. Kevin --- >From 762a9230466908583f80754a51f3349754e5b4c3 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 e9be7b95d1..43383e47e0 100644 --- a/lib/gro/gro_tcp.h +++ b/lib/gro/gro_tcp.h @@ -134,5 +134,5 @@ merge_two_tcp_packets(struct gro_tcp_item *item, 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.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-31 13:53:53.863266731 +0000 +++ 0051-gro-fix-payload-corruption-in-coalescing-packets.patch 2025-10-31 13:53:52.162329417 +0000 @@ -1 +1 @@ -From 33358ccc291fbc39d93b3c3975bebec1c38ab56d Mon Sep 17 00:00:00 2001 +From 762a9230466908583f80754a51f3349754e5b4c3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 33358ccc291fbc39d93b3c3975bebec1c38ab56d ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org