Hi Raslan, > -----Original Message----- > From: Raslan Darawsheh <rasl...@mellanox.com> > Sent: Thursday, April 23, 2020 9:41 AM > To: Iremonger, Bernard <bernard.iremon...@intel.com>; Wu, Jingjing > <jingjing...@intel.com>; Lu, Wenzhuo <wenzhuo...@intel.com> > Cc: Yigit, Ferruh <ferruh.yi...@intel.com>; dev@dpdk.org; sta...@dpdk.org > Subject: [PATCH v2] app/testpmd: add parsing for multiple VLAN headers
Might be better to replace "multiple" with QINQ in the commit message. > When having multiple VLANs in the packet, parse_ethernet is cabable of Might be better to replace "multiple" with QINQ > parsing only the first vlan. > > add parsing for mutliple VLAN headers in the packet. Might be better to replace "multiple" with QINQ > > Fixes: 51f694dd40f5 ("app/testpmd: rework checksum forward engine") > Cc: sta...@dpdk.org > > Signed-off-by: Raslan Darawsheh <rasl...@mellanox.com> > Acked-by: Ori Kam <or...@mellanox.com> > Acked-by: Bernard Iremonger <bernard.iremon...@intel.com> > --- > v2: added QinQ to check for multiple vlan's > --- > app/test-pmd/csumonly.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index > fe19615..8626223 100644 > --- a/app/test-pmd/csumonly.c > +++ b/app/test-pmd/csumonly.c > @@ -139,22 +139,23 @@ parse_ipv6(struct rte_ipv6_hdr *ipv6_hdr, struct > testpmd_offload_info *info) > > /* > * Parse an ethernet header to fill the ethertype, l2_len, l3_len and > - * ipproto. This function is able to recognize IPv4/IPv6 with one optional > vlan > - * header. The l4_len argument is only set in case of TCP (useful for TSO). > + * ipproto. This function is able to recognize IPv4/IPv6 with optional > + VLAN > + * headers. The l4_len argument is only set in case of TCP (useful for TSO). > */ > static void > parse_ethernet(struct rte_ether_hdr *eth_hdr, struct > testpmd_offload_info *info) { > struct rte_ipv4_hdr *ipv4_hdr; > struct rte_ipv6_hdr *ipv6_hdr; > + struct rte_vlan_hdr *vlan_hdr; > > info->l2_len = sizeof(struct rte_ether_hdr); > info->ethertype = eth_hdr->ether_type; > > - if (info->ethertype == _htons(RTE_ETHER_TYPE_VLAN)) { > - struct rte_vlan_hdr *vlan_hdr = ( > - struct rte_vlan_hdr *)(eth_hdr + 1); > - > + while (info->ethertype == _htons(RTE_ETHER_TYPE_VLAN) || > + info->ethertype == _htons(RTE_ETHER_TYPE_QINQ)) { > + vlan_hdr = (struct rte_vlan_hdr *) > + ((char *)eth_hdr + info->l2_len); > info->l2_len += sizeof(struct rte_vlan_hdr); > info->ethertype = vlan_hdr->eth_proto; > } > -- > 2.7.4 Otherwise Acked-by: Bernard Iremonger <bernard.iremon...@intel.com>