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 5415548B69 for ; Fri, 21 Nov 2025 12:23:41 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4D62B402E6; Fri, 21 Nov 2025 12:23:41 +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 35C3E4026F for ; Fri, 21 Nov 2025 12:23:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763724219; 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=VErJxQkpP0OHi2keJHhZQRuBWq2RT0t8bIGSJSCMIZs=; b=QDZz9Yd2u5W0ldd2rs2EB3lrio6MsRjYxJdDYuA93OBg1fj07O1aEu/u5I99b40NkMPDty 6kNMM0RAHRINScInb+cQPdJWI58r11Agft4QPfwpmJxfbspT4W2pyl0a/9kjrqc8tiBSIt CA/XXdrQsHAjzXJYOMccP61/sl7dE7w= 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-29-exYcIOVHNwO22f-cNpAssA-1; Fri, 21 Nov 2025 06:23:35 -0500 X-MC-Unique: exYcIOVHNwO22f-cNpAssA-1 X-Mimecast-MFC-AGG-ID: exYcIOVHNwO22f-cNpAssA_1763724214 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 CDF941956089; Fri, 21 Nov 2025 11:23:34 +0000 (UTC) Received: from rh.redhat.com (unknown [10.42.28.165]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4462430044DB; Fri, 21 Nov 2025 11:23:32 +0000 (UTC) From: Kevin Traynor To: Dengdui Huang Cc: Chengwen Feng , dpdk stable Subject: patch 'net: fix L2 length for GRE packets' has been queued to stable release 24.11.4 Date: Fri, 21 Nov 2025 11:20:39 +0000 Message-ID: <20251121112128.485623-55-ktraynor@redhat.com> In-Reply-To: <20251121112128.485623-1-ktraynor@redhat.com> References: <20251121112128.485623-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: C3ZMeJN5WqGfi3e4YnP1bnFrBKCjpa-W0dy3R86fWuU_1763724214 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/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/fe0f16d46ca894156cb6dc9a1e5a16aa6a935308 Thanks. Kevin --- >From fe0f16d46ca894156cb6dc9a1e5a16aa6a935308 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 @@ -377,4 +377,5 @@ l3: pkt_type |= ptype_tunnel(&proto, m, &off); hdr_lens->tunnel_len = off - prev_off; + hdr_lens->inner_l2_len = off - prev_off; } -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-21 11:05:11.338310154 +0000 +++ 0055-net-fix-L2-length-for-GRE-packets.patch 2025-11-21 11:05:09.522201421 +0000 @@ -1 +1 @@ -From cb699a047d1f2c1cead545db2d266ab5f396b550 Mon Sep 17 00:00:00 2001 +From fe0f16d46ca894156cb6dc9a1e5a16aa6a935308 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,2 +25,2 @@ -@@ -482,4 +482,5 @@ l3: - pkt_type |= ptype_tunnel_without_udp(&proto, m, &off); +@@ -377,4 +377,5 @@ l3: + pkt_type |= ptype_tunnel(&proto, m, &off);