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 5180A48AEF for ; Wed, 12 Nov 2025 17:55:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4C1F340DDB; Wed, 12 Nov 2025 17:55:26 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id 6A53D40DDB for ; Wed, 12 Nov 2025 17:55:25 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-47774d3536dso8116355e9.0 for ; Wed, 12 Nov 2025 08:55:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762966525; x=1763571325; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eVV6afkUJtJqy37y2fsbMXS2Pufu1YRKpjJPEkneGqI=; b=Utd2GE5ZR19vvCkOT+hrEURovNpXAImts0OWLsLNpi+xpNYtFdrbm3aVlSTsn+BW75 IhW7W4elcq9yR6k4ywFJI9j8ZxuwzPMGcCovgxRiH6x7AaNUhX8gPjsmmMSQovGXS47C hCN1PMFDIYfMPFaP5w100kVDocTDFcbkmEw+lwBmCckhO+dniX9U9mGg8FzKYKpv2Cw/ d+77BCLHMDiP1PJ9Omu7iN6hiS9puf9QFKbiq80C5iUhxixHpJAxOSy1Ml4yzdVy/7F3 F5ylQS7fuYkLU3IWF0g58Simn3xBUkl4bjB5ZVjhR4lWp1Zy5xeGUXnQFW9hkHdd81s8 xL/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762966525; x=1763571325; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=eVV6afkUJtJqy37y2fsbMXS2Pufu1YRKpjJPEkneGqI=; b=KEuTpYUkB801XKpQIEvcs9Amk5V6rVaVbT3v5E16C4v9HBqyaivuIh/Ke/SvmJ8nvy 3d7DWsSVjnpviDY2G+JXz4k3tcCxHEtagCHjhaHuucyo+QlnoOYxsMzJgyJAZiQTzYi7 P36+w5fymMWmwYScSNlNLQgh/GKYY5oVW11O0Fcy/2ZQpRVDZmqe5fZ8zSkSbwl2+vRd /ItlC9iHl0Q2N1wF2bSioBAryD9G6UYu5ap0vKy296nGyqp3q8tMMDQwV7RFwZQ1BE2V 0CV6iOYAWs2dQyRo3Eqk91inBmj/20I4kRfq0M3ZJa8uX8mQMKOzo9aLy5lNCuTo6Rnk O3Zw== X-Forwarded-Encrypted: i=1; AJvYcCUfj5lfN2Ad3fqfytLNXs0dCxEA6MLaDoscKSauTPLXtRBJNesJsyT/idY7HJidzTTp78abkk0=@dpdk.org X-Gm-Message-State: AOJu0YzcVIhg2F5JaTDBw35j/peLuwJVPoJjWsoRAXwwmIQ5Lqxy+9xw EtLeiDqcSicUx2iBzg1udJwAYj1XwQfCzUqInLSYKzaHq1sndQtP0FMkDalchQ== X-Gm-Gg: ASbGncuN5jevyBGrYskAyQb4TkbIt9d8AXlLAqjcKwsMhJyoPAeBAk6k7cdtLueSyPI ni9iQG/ykc4DSsdnkPDiYFSfx6cP5WclcEU7/E7jNPXs6TzgZtEi3WnSThguFPyHrBitHqEcodQ npA5SzPOwP/XQQLlBcfZMQNpuUs93KxmSDaSOLrxhJlRoTnNh4+d4TKm9W/0BKtt4EKDEENdzqq EAMGWsWp44FMLKHuliVsP5+Iys5+XHXLjAuMdwz3QB+o933OJLKmZzlpRzYmne5bgs2I5edmHjP qNaa0e/9yliiXEvZu1+B6v8wwRqu3vfebgWLIWEXzlu/IL5D1gFZ4sl7ReUn6xzqTqJ7vNRRKi+ E21MY9ZX5SIJo83mQ7OCzL4UqmIRuGTf7MqGgGKfgGLX9W72h9VT6b9za581n7iQiQUIMH7xKry CEW4aorCXrBTMXHO3c X-Google-Smtp-Source: AGHT+IEQLZytmmO+1jmOvcp0Yk3/w5+0mcKp7dZrh1ygIsglGkqC+hYKmtrUNF8iUj+8yvvIEXLnxw== X-Received: by 2002:a05:600c:4f8c:b0:471:665:e688 with SMTP id 5b1f17b1804b1-4778bd792edmr211535e9.17.1762966524855; Wed, 12 Nov 2025 08:55:24 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:a397:14bc:5982:5745]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4778bae35d8sm1660215e9.0.2025.11.12.08.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Nov 2025 08:55:24 -0800 (PST) From: luca.boccassi@gmail.com To: Dengdui Huang Cc: Chengwen Feng , dpdk stable Subject: patch 'net: fix L2 length for GRE packets' has been queued to stable release 22.11.11 Date: Wed, 12 Nov 2025 16:52:56 +0000 Message-ID: <20251112165308.1618107-42-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251112165308.1618107-1-luca.boccassi@gmail.com> References: <20251027162001.3710450-79-luca.boccassi@gmail.com> <20251112165308.1618107-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.11 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/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/908a8673c827df75b58b4ca152e2b3b0afb57117 Thanks. Luca Boccassi --- >From 908a8673c827df75b58b4ca152e2b3b0afb57117 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.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-12 16:20:42.586714786 +0000 +++ 0042-net-fix-L2-length-for-GRE-packets.patch 2025-11-12 16:20:41.003718817 +0000 @@ -1 +1 @@ -From cb699a047d1f2c1cead545db2d266ab5f396b550 Mon Sep 17 00:00:00 2001 +From 908a8673c827df75b58b4ca152e2b3b0afb57117 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);