[v3] app/testpmd: add parsing for QINQ VLAN headers
Checks
Commit Message
When having QINQ VLAN headers in the packet, parse_ethernet
is cabable of parsing only the first vlan.
add parsing for QINQ VLAN headers in the packet.
Fixes: 51f694dd40f5 ("app/testpmd: rework checksum forward engine")
Cc: stable@dpdk.org
Signed-off-by: Raslan Darawsheh <rasland@mellanox.com>
Acked-by: Ori Kam <orika@mellanox.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
v2: added QinQ to check for multiple vlan's
v3: reword commit to replace Multiple with QINQ
---
app/test-pmd/csumonly.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
Comments
On 4/23/2020 10:05 AM, Raslan Darawsheh wrote:
> When having QINQ VLAN headers in the packet, parse_ethernet
> is cabable of parsing only the first vlan.
>
> add parsing for QINQ VLAN headers in the packet.
>
> Fixes: 51f694dd40f5 ("app/testpmd: rework checksum forward engine")
> Cc: stable@dpdk.org
>
> Signed-off-by: Raslan Darawsheh <rasland@mellanox.com>
> Acked-by: Ori Kam <orika@mellanox.com>
> Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
Applied to dpdk-next-net/master, thanks.
@@ -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;
}