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 8AF5846466; Mon, 24 Mar 2025 14:18:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8E25740A7F; Mon, 24 Mar 2025 14:18:49 +0100 (CET) Received: from dkmailrelay1.smartsharesystems.com (smartserver.smartsharesystems.com [77.243.40.215]) by mails.dpdk.org (Postfix) with ESMTP id 11CF140A71 for ; Mon, 24 Mar 2025 14:18:48 +0100 (CET) Received: from smartserver.smartsharesystems.com (smartserver.smartsharesys.local [192.168.4.10]) by dkmailrelay1.smartsharesystems.com (Postfix) with ESMTP id D2221204FE; Mon, 24 Mar 2025 14:18:47 +0100 (CET) Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Subject: RE: [PATCH v3] app/testpmd: fix VLAN header parsing X-MimeOLE: Produced By Microsoft Exchange V6.5 Date: Mon, 24 Mar 2025 14:18:45 +0100 Message-ID: <98CBD80474FA8B44BF855DF32C47DC35E9FB4B@smartserver.smartshare.dk> In-Reply-To: <20250324093349.26509-1-rasland@nvidia.com> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: [PATCH v3] app/testpmd: fix VLAN header parsing Thread-Index: Aducn/EcYotcilBpTQOAk/Ehnm1gJQAHjxPg References: <20250323122822.90407-1-rasland@nvidia.com> <20250324093349.26509-1-rasland@nvidia.com> From: =?iso-8859-1?Q?Morten_Br=F8rup?= To: "Raslan Darawsheh" , Cc: , , 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 > From: Raslan Darawsheh [mailto:rasland@nvidia.com] > Sent: Monday, 24 March 2025 10.34 >=20 > When processing VLAN or QinQ packets, an infinite loop occurred, > preventing the csum forward engine from proceeding and causing > testpmd to hang during shutdown attempts. >=20 > Updated the `get_ethertype_by_ptype` function to correctly parse > VLAN headers. >=20 > Fixes: 76730c7b9b5a ("app/testpmd: use packet type parsing API") > Cc: haijie1@huawei.com >=20 > Signed-off-by: Raslan Darawsheh > --- > v3: fixed wrong indentation > add boundaries check for 8 VLANs at max >=20 > v2: update commit log > fixed pointer handling to actually move the pointer > --- > app/test-pmd/csumonly.c | 16 +++++++++++----- > 1 file changed, 11 insertions(+), 5 deletions(-) >=20 > diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c > index 5b906eaa53..710967ca4d 100644 > --- a/app/test-pmd/csumonly.c > +++ b/app/test-pmd/csumonly.c > @@ -59,6 +59,8 @@ > #define GRE_SUPPORTED_FIELDS (GRE_CHECKSUM_PRESENT | GRE_KEY_PRESENT > |\ > GRE_SEQUENCE_PRESENT) >=20 > +#define MAX_VLAN_HEADERS 8 > + > /* We cannot use rte_cpu_to_be_16() on a constant in a switch/case */ > #if RTE_BYTE_ORDER =3D=3D RTE_LITTLE_ENDIAN > #define _htons(x) ((uint16_t)((((x) & 0x00ffU) << 8) | (((x) & > 0xff00U) >> 8))) > @@ -466,9 +468,10 @@ pkts_ip_csum_recalc(struct rte_mbuf **pkts_burst, > const uint16_t nb_pkts, uint64 > static uint32_t > get_ethertype_by_ptype(struct rte_ether_hdr *eth_hdr, uint32_t ptype) > { > - struct rte_vlan_hdr *vlan_hdr; > + struct rte_vlan_hdr *vlan_hdr, *max_vlans; > uint16_t ethertype; >=20 > + Please omit adding an extra empty line. > switch (ptype) { > case RTE_PTYPE_L3_IPV4: > case RTE_PTYPE_L3_IPV4_EXT: > @@ -486,10 +489,13 @@ get_ethertype_by_ptype(struct rte_ether_hdr > *eth_hdr, uint32_t ptype) > return _htons(RTE_ETHER_TYPE_IPV6); > default: > ethertype =3D eth_hdr->ether_type; > - while (eth_hdr->ether_type =3D=3D _htons(RTE_ETHER_TYPE_VLAN) > || > - eth_hdr->ether_type =3D=3D _htons(RTE_ETHER_TYPE_QINQ)) { > - vlan_hdr =3D (struct rte_vlan_hdr *) > - ((char *)eth_hdr + sizeof(*eth_hdr)); > + vlan_hdr =3D (struct rte_vlan_hdr *) RTE_PTR_ADD(eth_hdr, > + offsetof(struct rte_ether_hdr, > ether_type)); Above line indentation with 2, not 3 TABs. > + max_vlans =3D vlan_hdr + MAX_VLAN_HEADERS; > + while (((ethertype =3D=3D _htons(RTE_ETHER_TYPE_VLAN) || Superfluous parenthesis: "while ( ((x || y)) && z)". > + ethertype =3D=3D _htons(RTE_ETHER_TYPE_QINQ))) && > + vlan_hdr < max_vlans) { Above two lines indentation with 2, not 1 TAB. > + vlan_hdr++; > ethertype =3D vlan_hdr->eth_proto; > } > return ethertype; > -- > 2.39.5 (Apple Git-154) With above nits fixed (can be fixed when merging), Reviewed-by: Morten Br=F8rup