From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B321F9B610 for ; Wed, 22 Apr 2026 10:38:50 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 69BBB40649; Wed, 22 Apr 2026 12:38:49 +0200 (CEST) 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 2B2C9402E0 for ; Wed, 22 Apr 2026 12:38:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776854327; 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=LVlFtVteSXPjOqcEy6T9aubwvOgtsgvJ7Hvt1D4/jrw=; b=ABIiJ5fdnOomscgKfFb6ORpTUrphhYy6XPS3mOxQclpYbvuMBQzHL7znSe0tvAsQW3wC/e JEEDAU8vLklt0fk2bNWkRmrRkOxQRiuDni3AMmvIcWSfPeGcpNLvt8qey+hDBZH+g8rvC5 /bRsL5ga/+K8YAzSMrceIN7kFxhNRKw= Received: from mx-prod-mc-01.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-633-SRgyS4C-O2eKi0oj67uJrw-1; Wed, 22 Apr 2026 06:38:44 -0400 X-MC-Unique: SRgyS4C-O2eKi0oj67uJrw-1 X-Mimecast-MFC-AGG-ID: SRgyS4C-O2eKi0oj67uJrw_1776854323 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8B37619560BB; Wed, 22 Apr 2026 10:38:43 +0000 (UTC) Received: from ringo.home (unknown [10.44.48.32]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1E3D23000C15; Wed, 22 Apr 2026 10:38:41 +0000 (UTC) From: Robin Jarry To: dev@dpdk.org, Gregory Etelson Cc: stable@dpdk.org Subject: [PATCH dpdk v2] net: fix L2 ptype assignment in VLAN loop Date: Wed, 22 Apr 2026 12:38:38 +0200 Message-ID: <20260422103838.649578-2-rjarry@redhat.com> In-Reply-To: <20260422102814.645299-2-rjarry@redhat.com> References: <20260422102814.645299-2-rjarry@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: GKnPJwixQm-CqrzHj_YUdKhmBrEGoaBkBU-WOxDOcD0_1776854323 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Since commit 1f250674085a ("net: fix packet type for stacked VLAN"), rte_net_get_ptype() uses |= to set the L2 ptype inside the VLAN parsing loop. Since pkt_type is already initialized with RTE_PTYPE_L2_ETHER (0x1), or-ing it with RTE_PTYPE_L2_ETHER_VLAN (0x6) results in RTE_PTYPE_L2_ETHER_QINQ (0x7). This causes single VLAN frames to be misidentified as QinQ. This was detected while testing DPDK 25.11.1 in grout. The net/tap driver calls rte_net_get_ptype() in tap_verify_csum() to determine the L2 header length. With the wrong ptype, l2_len is set to 22 (ether + QinQ = 14 + 8) instead of 18 (ether + VLAN = 14 + 4), shifting the IP header pointer by 4 bytes. The checksum is then computed on garbage data, causing valid packets to be dropped. Use a simple assignment to replace the L2 ptype instead. Add a ptype unit test covering plain Ethernet, VLAN and QinQ L2 detection to prevent regressions. Fixes: 1f250674085a ("net: fix packet type for stacked VLAN") Cc: stable@dpdk.org Signed-off-by: Robin Jarry --- Notes: v2: added new ptype tests app/test/meson.build | 1 + app/test/test_net_ptype.c | 117 ++++++++++++++++++++++++++++++++++++++ lib/net/rte_net.c | 2 +- 3 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 app/test/test_net_ptype.c diff --git a/app/test/meson.build b/app/test/meson.build index 7d458f9c079a..9f4afb040a46 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -135,6 +135,7 @@ source_file_deps = { 'test_mp_secondary.c': ['hash'], 'test_net_ether.c': ['net'], 'test_net_ip6.c': ['net'], + 'test_net_ptype.c': ['net'], 'test_pcapng.c': ['net_null', 'net', 'ethdev', 'pcapng', 'bus_vdev'], 'test_pdcp.c': ['eventdev', 'pdcp', 'net', 'timer', 'security'], 'test_pdump.c': ['pdump'] + sample_packet_forward_deps, diff --git a/app/test/test_net_ptype.c b/app/test/test_net_ptype.c new file mode 100644 index 000000000000..9619c1d54a8e --- /dev/null +++ b/app/test/test_net_ptype.c @@ -0,0 +1,117 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2026 Red Hat, Inc. + */ + +#include + +#include +#include + +#include +#include "test.h" + +#define MEMPOOL_CACHE_SIZE 0 +#define MBUF_DATA_SIZE 256 +#define NB_MBUF 128 + +/* Ether()/IP()/UDP()/Raw('x') */ +static const char pkt_ether_ipv4_udp[] = { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00, + 0x00, 0x1d, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11, + 0x7c, 0xcd, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00, + 0x00, 0x01, 0x00, 0x35, 0x00, 0x35, 0x00, 0x09, + 0x89, 0x6f, 0x78, +}; + +/* Ether()/Dot1Q(vlan=42)/IP()/UDP()/Raw('x') */ +static const char pkt_vlan_ipv4_udp[] = { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x81, 0x00, 0x00, 0x2a, + 0x08, 0x00, 0x45, 0x00, 0x00, 0x1d, 0x00, 0x01, + 0x00, 0x00, 0x40, 0x11, 0x7c, 0xcd, 0x7f, 0x00, + 0x00, 0x01, 0x7f, 0x00, 0x00, 0x01, 0x00, 0x35, + 0x00, 0x35, 0x00, 0x09, 0x89, 0x6f, 0x78, +}; + +/* Ether()/Dot1AD(vlan=42)/Dot1Q(vlan=43)/IP()/UDP()/Raw('x') */ +static const char pkt_qinq_ipv4_udp[] = { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x88, 0xa8, 0x00, 0x2a, + 0x81, 0x00, 0x00, 0x2b, 0x08, 0x00, 0x45, 0x00, + 0x00, 0x1d, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11, + 0x7c, 0xcd, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00, + 0x00, 0x01, 0x00, 0x35, 0x00, 0x35, 0x00, 0x09, + 0x89, 0x6f, 0x78, +}; + +static int +test_get_ptype(struct rte_mempool *pool, const char *pktdata, size_t len, + uint32_t expected_l2, uint8_t expected_l2_len) +{ + struct rte_net_hdr_lens hdr_lens; + struct rte_mbuf *m; + uint32_t ptype; + uint32_t l2; + char *data; + + m = rte_pktmbuf_alloc(pool); + RTE_TEST_ASSERT_NOT_NULL(m, "cannot allocate mbuf"); + + data = rte_pktmbuf_append(m, len); + if (data == NULL) { + rte_pktmbuf_free(m); + RTE_TEST_ASSERT_NOT_NULL(data, "cannot append data"); + } + + memcpy(data, pktdata, len); + + ptype = rte_net_get_ptype(m, &hdr_lens, RTE_PTYPE_ALL_MASK); + l2 = ptype & RTE_PTYPE_L2_MASK; + + rte_pktmbuf_free(m); + + RTE_TEST_ASSERT_EQUAL(l2, expected_l2, + "unexpected L2 ptype: got 0x%x, expected 0x%x", + l2, expected_l2); + RTE_TEST_ASSERT_EQUAL(hdr_lens.l2_len, expected_l2_len, + "unexpected l2_len: got %u, expected %u", + hdr_lens.l2_len, expected_l2_len); + + return 0; +} + +static int +test_net_ptype(void) +{ + struct rte_mempool *pool; + + pool = rte_pktmbuf_pool_create("test_ptype_mbuf_pool", + NB_MBUF, MEMPOOL_CACHE_SIZE, 0, MBUF_DATA_SIZE, + SOCKET_ID_ANY); + RTE_TEST_ASSERT_NOT_NULL(pool, "cannot allocate mbuf pool"); + + if (test_get_ptype(pool, pkt_ether_ipv4_udp, + sizeof(pkt_ether_ipv4_udp), + RTE_PTYPE_L2_ETHER, 14)) + goto fail; + + if (test_get_ptype(pool, pkt_vlan_ipv4_udp, + sizeof(pkt_vlan_ipv4_udp), + RTE_PTYPE_L2_ETHER_VLAN, 18)) + goto fail; + + if (test_get_ptype(pool, pkt_qinq_ipv4_udp, + sizeof(pkt_qinq_ipv4_udp), + RTE_PTYPE_L2_ETHER_QINQ, 22)) + goto fail; + + rte_mempool_free(pool); + return 0; + +fail: + rte_mempool_free(pool); + return -1; +} + +REGISTER_FAST_TEST(net_ptype_autotest, NOHUGE_OK, ASAN_OK, test_net_ptype); diff --git a/lib/net/rte_net.c b/lib/net/rte_net.c index 458b4814a9c9..ea5ba7019089 100644 --- a/lib/net/rte_net.c +++ b/lib/net/rte_net.c @@ -359,7 +359,7 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m, if (++vlan_depth > RTE_NET_VLAN_MAX_DEPTH) return 0; - pkt_type |= + pkt_type = proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN) ? RTE_PTYPE_L2_ETHER_VLAN : RTE_PTYPE_L2_ETHER_QINQ; -- 2.53.0